Noratrieb/cluelessh
1
0
Fork 0
mirror of https://github.com/Noratrieb/cluelessh.git synced 2026-01-16 09:25:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

make kex more pluggable

Browse source
This commit is contained in:
nora 2024-08-12 18:00:30 +02:00
parent 11fcb4cd84
commit 1cdea4763d
5 changed files with 86 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ssh-transport/src/parse.rs
View file

@ -58,8 +58,7 @@ impl<'a> Parser<'a> {
}
pub fn mpint(&mut self) -> Result<MpInt<'a>> {
let data = self.string()?;
Ok(MpInt(data))
todo!("do correctly")
}
pub fn string(&mut self) -> Result<&'a [u8]> {
@ -101,8 +100,8 @@ impl Writer {
self.string(list.0.as_bytes());
}
pub fn mpint(&mut self, mpint: MpInt<'_>) {
self.string(mpint.0);
pub fn mpint(&mut self, _mpint: MpInt<'_>) {
todo!("implement correctly?")
}
pub fn string(&mut self, data: &[u8]) {
@ -143,19 +142,5 @@ impl Debug for NameList<'_> {
}
}
// TODO: THIS IS A BRITTLE MESS BECAUSE THE RFC SUCKS HERE
// DO NOT TOUCH MPINT ENCODING ANYWHERE
#[derive(Debug, Clone, Copy)]
pub struct MpInt<'a>(pub(crate) &'a [u8]);
impl<'a> MpInt<'a> {
pub(crate) fn as_x25519_public_key(&self) -> Result<x25519_dalek::PublicKey> {
let Ok(arr) = <[u8; 32]>::try_from(self.0) else {
return Err(crate::client_error!(
"invalid x25519 public key length, should be 32, was: {}",
self.0.len()
));
};
Ok(x25519_dalek::PublicKey::from(arr))
}
}
pub struct MpInt<'a>(pub &'a [u8]);