{"header":{"message":"Adding post-quantum key exchange","description":null,"timestamp":"2026-08-01T07:59:56.643376034Z","authors":[{}]},"hash":"BBEXCEU4KAZPVV5PH6IFNWAOCMENUNGOSOFDV7YHDNCT3IVR473AC","authors":[{"login":"pmeunier","key":"AAAAC3NzaC1lZDI1NTE5AAAAILagOJFgwaMNhBWQINinKOXmqS4Gh5NgxgriXwdOoINJ"}],"deps":{"hashes":[["BBEXCEU4KAZPVV5PH6IFNWAOCMENUNGOSOFDV7YHDNCT3IVR473AC","Adding post-quantum key exchange"],["AA",null],["7FRJYUI62VW257VVFQXND6OKSAILVTHGEJCXFE6CG6FIOIUTDVYAC","Reboot because of a bad change"],["2WEO7OZLWJJPUYK4WXLT5FD46G2MAEIHEYMDW5GASCBUNKOPXCVAC","Version updates: getting rid of anyhow + moving to Tokio 1.0"],["NHOSLQGG4CIWBE7VKL5MB7PSY3RZ5IVDFENMGZG6X755GGZ6B3VQC","Thrussh: making OpenSSL optional"],["EUHO3DAZ4D3LMHYJDLVLXBHIFAUKXMNFNDLE5ZHG4T7SVJMG55EAC","Send a SSH_MSG_EXT_INFO with server-sig-algs when the client indicates they support extensions by sending ext-info-c. This allows modern clients that don't do ssh-rsa anymore because of sha1 to still use RSA keys with sha2."],["D6H7OWTTMHHX6BTB3B6MNBOBX2L66CBL4LGSEUSAI2MCRCJDQFRQC","Fixing the terrapin attack mitigation"],["32GIIFWR6CUE24WCZJHM2D76QVXV4SNPOUNXJB62LGALJJSWCZUQC","Fixing strict mode"],["OBHPOIUH2CPAB2ORVMOGAAQVN4NYP6GHGTIODEQ46VUFNZIUAIRQC","Modernising the API with async traits"],["WX7UY5KKUXOHBGPNWJC6ZQDQ3LFGNTKGF6ZQFIPYNI6H5IMWGOYAC","Adding support for aes256-gcm"],["LYRZREY75IOPQJ3DMJJB4SINAEVI5P5TE32SSFO7QKFBDYVXXKNAC","Adding support for MACs and AES in CTR mode"],["5POTCWP5BFLZA7Z4KMTXMK44FGG7M3BEBKAO5GNCXMTKZCMDJDYAC","Refactoring"],["DCB62332QO66ZZXVWKK67QQE5MFND6DYXQHUD33AJ7E2F7U3JJMAC","version bumps"],["VJIXIN4TVZX2ZELE3H5PVZIO6JIG7JZ3UKEJC7TAUYLOPW6GOGOQC","Fixing CVE-2023-48795"],["WXZWQLGLNQ3QRHMBH7YPTHKSPUST4HD34H3PW5E4LHQYH3KLNHYAC","Correct negotiation without OpenSSL"],["UHAEQPZUODJ5YVBZJPPJVLO7EBW6DC2JXHQBN26ARELAVULG3JUQC","Support ecdsa-sha2-nistp256 keys for authentication"],["TAOFQAIISOBF3NJ5BG72NRG5JSTIJN4X2QZXFPB75US6WTFSK7DQC","cargo fmt"]],"deps":["7FRJYUI62VW257VVFQXND6OKSAILVTHGEJCXFE6CG6FIOIUTDVYAC","2WEO7OZLWJJPUYK4WXLT5FD46G2MAEIHEYMDW5GASCBUNKOPXCVAC","NHOSLQGG4CIWBE7VKL5MB7PSY3RZ5IVDFENMGZG6X755GGZ6B3VQC","EUHO3DAZ4D3LMHYJDLVLXBHIFAUKXMNFNDLE5ZHG4T7SVJMG55EAC","D6H7OWTTMHHX6BTB3B6MNBOBX2L66CBL4LGSEUSAI2MCRCJDQFRQC","32GIIFWR6CUE24WCZJHM2D76QVXV4SNPOUNXJB62LGALJJSWCZUQC","OBHPOIUH2CPAB2ORVMOGAAQVN4NYP6GHGTIODEQ46VUFNZIUAIRQC","WX7UY5KKUXOHBGPNWJC6ZQDQ3LFGNTKGF6ZQFIPYNI6H5IMWGOYAC","LYRZREY75IOPQJ3DMJJB4SINAEVI5P5TE32SSFO7QKFBDYVXXKNAC","5POTCWP5BFLZA7Z4KMTXMK44FGG7M3BEBKAO5GNCXMTKZCMDJDYAC","DCB62332QO66ZZXVWKK67QQE5MFND6DYXQHUD33AJ7E2F7U3JJMAC"],"known":["WXZWQLGLNQ3QRHMBH7YPTHKSPUST4HD34H3PW5E4LHQYH3KLNHYAC","TAOFQAIISOBF3NJ5BG72NRG5JSTIJN4X2QZXFPB75US6WTFSK7DQC","UHAEQPZUODJ5YVBZJPPJVLO7EBW6DC2JXHQBN26ARELAVULG3JUQC","VJIXIN4TVZX2ZELE3H5PVZIO6JIG7JZ3UKEJC7TAUYLOPW6GOGOQC"]},"hunks":[{"Replacement":{"inode":{"change":2,"pos":268386},"path":"ssh/src/negotiation.rs","line":121,"ins":{"up_context":[{"change":7,"pos":398}],"down_context":[{"change":11,"pos":1089}],"flag":"BLOCK","start":0,"end":69,"inode":{"change":2,"pos":268386}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":398},"to":{"change":6,"start":1685,"end":1733},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1685},"to":{"change":6,"start":1685,"end":1733},"introduced_by":6}],"inode":{"change":2,"pos":268386}},"ins_contents":[{"Add":" kex: &[kex::MLKEM768X25519, kex::CURVE25519, kex::STRICT_S],"}],"del_contents":[{"Del":" kex: &[kex::CURVE25519, kex::STRICT_S],\n"}]}},{"Replacement":{"inode":{"change":2,"pos":268386},"path":"ssh/src/negotiation.rs","line":130,"ins":{"up_context":[{"change":11,"pos":1184}],"down_context":[{"change":11,"pos":1232}],"flag":"BLOCK","start":70,"end":139,"inode":{"change":2,"pos":268386}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1184},"to":{"change":11,"start":1184,"end":1232},"introduced_by":11}],"inode":{"change":2,"pos":268386}},"ins_contents":[{"Add":" kex: &[kex::MLKEM768X25519, kex::CURVE25519, kex::STRICT_S],"}],"del_contents":[{"Del":" kex: &[kex::CURVE25519, kex::STRICT_S],\n"}]}},{"Edit":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":24,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":1014},"to":{"change":2,"start":307730,"end":308121},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":307730},"to":{"change":2,"start":307730,"end":308121},"introduced_by":2}],"inode":{"change":2,"pos":306916}}},"contents":[{"Del":"\n#[doc(hidden)]\npub struct Algorithm {\n local_secret: Option,\n shared_secret: Option,\n}\n\nimpl std::fmt::Debug for Algorithm {\n fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {\n write!(\n f,\n \"Algorithm {{ local_secret: [hidden], shared_secret: [hidden] }}\",\n )\n }\n}\n"}]}},{"Edit":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":32,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":308279}],"down_context":[{"change":2,"pos":308279}],"flag":"BLOCK","start":140,"end":141,"inode":{"change":2,"pos":306916}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":34,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":308346}],"down_context":[{"change":6,"pos":2260}],"flag":"BLOCK","start":142,"end":206,"inode":{"change":2,"pos":306916}}},"contents":[{"Add":"pub const MLKEM768X25519: Name = Name(\"mlkem768x25519-sha256\");"}]}},{"Edit":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":39,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":1907}],"down_context":[{"change":2,"pos":308346}],"flag":"BLOCK","start":207,"end":573,"inode":{"change":2,"pos":306916}}},"contents":[{"Add":""},{"Add":"// Wire format sizes for ML-KEM-768 (FIPS 203)"},{"Add":"const MLKEM768_EK_SIZE: usize = 1184;"},{"Add":"const MLKEM768_CT_SIZE: usize = 1088;"},{"Add":""},{"Add":"struct MlKem768X25519State {"},{"Add":" dk: ml_kem::DecapsulationKey,"},{"Add":" x25519_sk: sodium::scalarmult::Scalar,"},{"Add":"}"},{"Add":""},{"Add":"enum KexLocalSecret {"},{"Add":" Curve25519(sodium::scalarmult::Scalar),"},{"Add":" MlKem768X25519(Box),"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":61,"ins":{"up_context":[{"change":2,"pos":308511}],"down_context":[{"change":2,"pos":308655}],"flag":"BLOCK","start":574,"end":928,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":308511},"to":{"change":2,"start":308511,"end":308655},"introduced_by":2}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":"#[doc(hidden)]"},{"Add":"pub struct Algorithm {"},{"Add":" local_secret: Option,"},{"Add":" shared_secret: Option<[u8; 32]>,"},{"Add":"}"},{"Add":""},{"Add":"impl std::fmt::Debug for Algorithm {"},{"Add":" fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" write!("},{"Add":" f,"},{"Add":" \"Algorithm {{ local_secret: [hidden], shared_secret: [hidden] }}\","},{"Add":" )"},{"Add":" }"},{"Add":"}"}],"del_contents":[{"Del":"// We used to support curve \"NIST P-256\" here, but the security of\n// that curve is controversial, see\n// http://safecurves.cr.yp.to/rigid.html\n"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":79,"ins":{"up_context":[{"change":2,"pos":308714}],"down_context":[{"change":2,"pos":308735}],"flag":"BLOCK","start":929,"end":949,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":308714},"to":{"change":2,"start":308714,"end":308735},"introduced_by":2}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":" name: Name,"}],"del_contents":[{"Del":" _name: Name,\n"}]}},{"Edit":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":84,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":308865}],"down_context":[{"change":2,"pos":308865}],"flag":"BLOCK","start":950,"end":1661,"inode":{"change":2,"pos":306916}}},"contents":[{"Add":" assert_eq!(payload[0], msg::KEX_ECDH_INIT);"},{"Add":""},{"Add":" match name {"},{"Add":" CURVE25519 => {"},{"Add":" use sodium::scalarmult::*;"},{"Add":" let mut client_pubkey = GroupElement([0; 32]);"},{"Add":" {"},{"Add":" let pubkey_len = BigEndian::read_u32(&payload[1..]) as usize;"},{"Add":" client_pubkey"},{"Add":" .0"},{"Add":" .clone_from_slice(&payload[5..(5 + pubkey_len)])"},{"Add":" };"},{"Add":" debug!(\"client_pubkey: {:?}\", client_pubkey);"},{"Add":" let mut server_secret = Scalar([0; 32]);"},{"Add":" rand::rng().fill_bytes(&mut server_secret.0);"},{"Add":" let server_pubkey = scalarmult_base(&server_secret);"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":101,"ins":{"up_context":[{"change":2,"pos":308866}],"down_context":[{"change":2,"pos":309450}],"flag":"BLOCK","start":1662,"end":4740,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":308866},"to":{"change":2,"start":308866,"end":309232},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":309262},"to":{"change":2,"start":309262,"end":309346},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":309346},"to":{"change":9,"start":444,"end":498},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":498},"to":{"change":2,"start":309389,"end":309450},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1076},"to":{"change":2,"start":309389,"end":309450},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":309389},"to":{"change":2,"start":309389,"end":309450},"introduced_by":2}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":" exchange.server_ephemeral.clear();"},{"Add":" exchange.server_ephemeral.extend(&server_pubkey.0);"},{"Add":" let shared = scalarmult(&server_secret, &client_pubkey);"},{"Add":""},{"Add":" let mut shared_32 = [0u8; 32];"},{"Add":" shared_32.copy_from_slice(&shared.0);"},{"Add":""},{"Add":" Ok(Algorithm {"},{"Add":" local_secret: None,"},{"Add":" shared_secret: Some(shared_32),"},{"Add":" })"},{"Add":" }"},{"Add":""},{"Add":" MLKEM768X25519 => {"},{"Add":" // Q_C = ML-KEM-768 encapsulation key (1184 B) || X25519 public key (32 B)"},{"Add":" let q_c_len = BigEndian::read_u32(&payload[1..]) as usize;"},{"Add":" if q_c_len != MLKEM768_EK_SIZE + 32 {"},{"Add":" return Err(crate::Error::KexInit);"},{"Add":" }"},{"Add":" let q_c = &payload[5..5 + q_c_len];"},{"Add":""},{"Add":" let client_ek_bytes = &q_c[..MLKEM768_EK_SIZE];"},{"Add":" let client_x25519_pk = &q_c[MLKEM768_EK_SIZE..];"},{"Add":""},{"Add":" // Parse client's ML-KEM-768 encapsulation key"},{"Add":" let ek_arr: ml_kem::Key> ="},{"Add":" client_ek_bytes"},{"Add":" .try_into()"},{"Add":" .map_err(|_| crate::Error::KexInit)?;"},{"Add":" let ek = ml_kem::EncapsulationKey::::new(&ek_arr)"},{"Add":" .map_err(|_| crate::Error::KexInit)?;"},{"Add":""},{"Add":" // Encapsulate: generate random 32-byte seed for ML-KEM, then encapsulate"},{"Add":" let mut m_bytes = [0u8; 32];"},{"Add":" rand::rng().fill_bytes(&mut m_bytes);"},{"Add":" let m: ml_kem::B32 = m_bytes[..].try_into().unwrap();"},{"Add":" let (ct, k_kem) = ek.encapsulate_deterministic(&m);"},{"Add":""},{"Add":" // Generate server X25519 keypair"},{"Add":" use sodium::scalarmult::*;"},{"Add":" let mut server_x25519_sk = Scalar([0; 32]);"},{"Add":" rand::rng().fill_bytes(&mut server_x25519_sk.0);"},{"Add":" let server_x25519_pk = scalarmult_base(&server_x25519_sk);"},{"Add":""},{"Add":" // X25519 DH with client's public key"},{"Add":" let mut client_x25519 = GroupElement([0; 32]);"},{"Add":" client_x25519.0.copy_from_slice(client_x25519_pk);"},{"Add":" let k_dh = scalarmult(&server_x25519_sk, &client_x25519);"},{"Add":""},{"Add":" // K = SHA-256(K_kem || K_dh) per draft-ietf-sshm-mlkem-hybrid-kex"},{"Add":" use sha2::Digest;"},{"Add":" let mut hasher = sha2::Sha256::new();"},{"Add":" hasher.update(&k_kem[..]);"},{"Add":" hasher.update(&k_dh.0);"},{"Add":" let k = hasher.finalize();"},{"Add":""},{"Add":" // Q_S = ciphertext (1088 B) || server X25519 public key (32 B)"},{"Add":" exchange.server_ephemeral.clear();"},{"Add":" exchange.server_ephemeral.extend(&ct[..]);"},{"Add":" exchange.server_ephemeral.extend(&server_x25519_pk.0);"},{"Add":""},{"Add":" let mut shared_32 = [0u8; 32];"},{"Add":" shared_32.copy_from_slice(&k);"},{"Add":""},{"Add":" Ok(Algorithm {"},{"Add":" local_secret: None,"},{"Add":" shared_secret: Some(shared_32),"},{"Add":" })"},{"Add":" }"}],"del_contents":[{"Del":" assert_eq!(payload[0], msg::KEX_ECDH_INIT);\n let mut client_pubkey = GroupElement([0; 32]);\n {\n let pubkey_len = BigEndian::read_u32(&payload[1..]) as usize;\n client_pubkey\n .0\n .clone_from_slice(&payload[5..(5 + pubkey_len)])\n };\n debug!(\"client_pubkey: {:?}\", client_pubkey);\n"},{"Del":" use sodium::scalarmult::*;\n let mut server_secret = Scalar([0; 32]);\n"},{"Del":" rand::rng().fill_bytes(&mut server_secret.0);\n"},{"Del":" let server_pubkey = scalarmult_base(&server_secret);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":171,"ins":{"up_context":[{"change":2,"pos":309451}],"down_context":[{"change":2,"pos":309752}],"flag":"BLOCK","start":4741,"end":4804,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":309451},"to":{"change":2,"start":309451,"end":309752},"introduced_by":2}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":" _ => Err(crate::Error::NoCommonKexAlgo),"},{"Add":" }"}],"del_contents":[{"Del":" // fill exchange.\n exchange.server_ephemeral.clear();\n exchange.server_ephemeral.extend(&server_pubkey.0);\n let shared = scalarmult(&server_secret, &client_pubkey);\n Ok(Algorithm {\n local_secret: None,\n shared_secret: Some(shared),\n })\n"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":177,"ins":{"up_context":[{"change":2,"pos":309800}],"down_context":[{"change":2,"pos":309821}],"flag":"BLOCK","start":4805,"end":4825,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":309800},"to":{"change":2,"start":309800,"end":309821},"introduced_by":2}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":" name: Name,"}],"del_contents":[{"Del":" _name: Name,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":181,"ins":{"up_context":[{"change":3,"pos":14749}],"down_context":[{"change":2,"pos":310154}],"flag":"BLOCK","start":4826,"end":6248,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":309966},"to":{"change":2,"start":309966,"end":310050},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":310050},"to":{"change":9,"start":499,"end":553},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":553},"to":{"change":2,"start":310093,"end":310154},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1138},"to":{"change":2,"start":310093,"end":310154},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":310093},"to":{"change":2,"start":310093,"end":310154},"introduced_by":2}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":" match name {"},{"Add":" CURVE25519 => {"},{"Add":" use sodium::scalarmult::*;"},{"Add":" let mut client_secret = Scalar([0; 32]);"},{"Add":" rand::rng().fill_bytes(&mut client_secret.0);"},{"Add":" let client_pubkey = scalarmult_base(&client_secret);"},{"Add":""},{"Add":" client_ephemeral.clear();"},{"Add":" client_ephemeral.extend(&client_pubkey.0);"},{"Add":""},{"Add":" buf.push(msg::KEX_ECDH_INIT);"},{"Add":" buf.extend_ssh_string(&client_pubkey.0);"},{"Add":""},{"Add":" Ok(Algorithm {"},{"Add":" local_secret: Some(KexLocalSecret::Curve25519(client_secret)),"},{"Add":" shared_secret: None,"},{"Add":" })"},{"Add":" }"},{"Add":""},{"Add":" MLKEM768X25519 => {"},{"Add":" use ml_kem::{DecapsulationKey, KeyExport, MlKem768};"},{"Add":""},{"Add":" // Generate ML-KEM-768 keypair from a random 64-byte seed"},{"Add":" let mut seed_bytes = [0u8; 64];"},{"Add":" rand::rng().fill_bytes(&mut seed_bytes);"},{"Add":" let seed: ml_kem::Seed = seed_bytes[..].try_into().unwrap();"},{"Add":" let dk = DecapsulationKey::::from_seed(seed);"},{"Add":" let ek = dk.encapsulation_key().clone();"},{"Add":""},{"Add":" // Generate X25519 keypair"},{"Add":" use sodium::scalarmult::*;"},{"Add":" let mut x25519_sk = Scalar([0; 32]);"},{"Add":" rand::rng().fill_bytes(&mut x25519_sk.0);"},{"Add":" let x25519_pk = scalarmult_base(&x25519_sk);"}],"del_contents":[{"Del":" use sodium::scalarmult::*;\n let mut client_secret = Scalar([0; 32]);\n"},{"Del":" rand::rng().fill_bytes(&mut client_secret.0);\n"},{"Del":" let client_pubkey = scalarmult_base(&client_secret);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":216,"ins":{"up_context":[{"change":2,"pos":310155}],"down_context":[{"change":2,"pos":310266}],"flag":"BLOCK","start":6249,"end":6425,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":310155},"to":{"change":2,"start":310155,"end":310266},"introduced_by":2}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":" // Q_C = EK (1184 B) || X25519 public key (32 B)"},{"Add":" let ek_bytes_arr = ek.to_bytes();"},{"Add":" let ek_bytes: &[u8] = ek_bytes_arr.as_ref();"}],"del_contents":[{"Del":" // fill exchange.\n client_ephemeral.clear();\n client_ephemeral.extend(&client_pubkey.0);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":220,"ins":{"up_context":[{"change":2,"pos":310267}],"down_context":[{"change":2,"pos":310354}],"flag":"BLOCK","start":6426,"end":6574,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":310267},"to":{"change":2,"start":310267,"end":310354},"introduced_by":2}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":" client_ephemeral.clear();"},{"Add":" client_ephemeral.extend(ek_bytes);"},{"Add":" client_ephemeral.extend(&x25519_pk.0);"}],"del_contents":[{"Del":" buf.push(msg::KEX_ECDH_INIT);\n buf.extend_ssh_string(&client_pubkey.0);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":224,"ins":{"up_context":[{"change":2,"pos":310355}],"down_context":[{"change":2,"pos":310469}],"flag":"BLOCK","start":6575,"end":7180,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":310355},"to":{"change":2,"start":310355,"end":310469},"introduced_by":2}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":" let mut q_c = Vec::with_capacity(MLKEM768_EK_SIZE + 32);"},{"Add":" q_c.extend_from_slice(ek_bytes);"},{"Add":" q_c.extend_from_slice(&x25519_pk.0);"},{"Add":""},{"Add":" buf.push(msg::KEX_ECDH_INIT);"},{"Add":" buf.extend_ssh_string(&q_c);"},{"Add":""},{"Add":" Ok(Algorithm {"},{"Add":" local_secret: Some(KexLocalSecret::MlKem768X25519(Box::new("},{"Add":" MlKem768X25519State { dk, x25519_sk },"},{"Add":" ))),"},{"Add":" shared_secret: None,"},{"Add":" })"},{"Add":" }"},{"Add":""},{"Add":" _ => Err(crate::Error::NoCommonKexAlgo),"},{"Add":" }"}],"del_contents":[{"Del":" Ok(Algorithm {\n local_secret: Some(client_secret),\n shared_secret: None,\n })\n"}]}},{"Edit":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":245,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":310659}],"down_context":[{"change":2,"pos":310659}],"flag":"BLOCK","start":7181,"end":7682,"inode":{"change":2,"pos":306916}}},"contents":[{"Add":""},{"Add":" match local_secret {"},{"Add":" KexLocalSecret::Curve25519(local_secret) => {"},{"Add":" use sodium::scalarmult::*;"},{"Add":" let mut remote_pubkey = GroupElement([0; 32]);"},{"Add":" remote_pubkey.0.clone_from_slice(remote_pubkey_);"},{"Add":" let shared = scalarmult(&local_secret, &remote_pubkey);"},{"Add":" let mut shared_32 = [0u8; 32];"},{"Add":" shared_32.copy_from_slice(&shared.0);"},{"Add":" self.shared_secret = Some(shared_32);"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":257,"ins":{"up_context":[{"change":2,"pos":310660}],"down_context":[{"change":2,"pos":310915}],"flag":"BLOCK","start":7683,"end":9080,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":310660},"to":{"change":2,"start":310660,"end":310915},"introduced_by":2}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":" KexLocalSecret::MlKem768X25519(state) => {"},{"Add":" // Q_S = ciphertext (1088 B) || server X25519 public key (32 B)"},{"Add":" if remote_pubkey_.len() != MLKEM768_CT_SIZE + 32 {"},{"Add":" return Err(crate::Error::KexInit);"},{"Add":" }"},{"Add":" let ct_bytes = &remote_pubkey_[..MLKEM768_CT_SIZE];"},{"Add":" let server_x25519_pk = &remote_pubkey_[MLKEM768_CT_SIZE..];"},{"Add":""},{"Add":" // Decapsulate to recover K_kem"},{"Add":" use ml_kem::Decapsulate;"},{"Add":" let k_kem = state"},{"Add":" .dk"},{"Add":" .decapsulate_slice(ct_bytes)"},{"Add":" .map_err(|_| crate::Error::KexInit)?;"},{"Add":""},{"Add":" // X25519 DH with server's public key"},{"Add":" use sodium::scalarmult::*;"},{"Add":" let mut server_pk = GroupElement([0; 32]);"},{"Add":" server_pk.0.copy_from_slice(server_x25519_pk);"},{"Add":" let k_dh = scalarmult(&state.x25519_sk, &server_pk);"},{"Add":""},{"Add":" // K = SHA-256(K_kem || K_dh)"},{"Add":" use sha2::Digest;"},{"Add":" let mut hasher = sha2::Sha256::new();"},{"Add":" hasher.update(&k_kem[..]);"},{"Add":" hasher.update(&k_dh.0);"},{"Add":" let k = hasher.finalize();"},{"Add":""},{"Add":" let mut shared_32 = [0u8; 32];"},{"Add":" shared_32.copy_from_slice(&k);"},{"Add":" self.shared_secret = Some(shared_32);"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" use sodium::scalarmult::*;\n let mut remote_pubkey = GroupElement([0; 32]);\n remote_pubkey.0.clone_from_slice(remote_pubkey_);\n let shared = scalarmult(&local_secret, &remote_pubkey);\n self.shared_secret = Some(shared);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":311,"ins":{"up_context":[{"change":2,"pos":311671}],"down_context":[{"change":2,"pos":311719}],"flag":"BLOCK","start":9081,"end":9126,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":311671},"to":{"change":2,"start":311671,"end":311719},"introduced_by":2}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":" buffer.extend_ssh_mpint(shared);"}],"del_contents":[{"Del":" buffer.extend_ssh_mpint(&shared.0);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":355,"ins":{"up_context":[{"change":10,"pos":5912}],"down_context":[{"change":10,"pos":5984}],"flag":"BLOCK","start":9127,"end":9196,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":10,"pos":5912},"to":{"change":10,"start":5912,"end":5984},"introduced_by":10}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":" buffer.extend_ssh_mpint(shared);"}],"del_contents":[{"Del":" buffer.extend_ssh_mpint(&shared.0);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":306916},"path":"ssh/src/kex.rs","line":373,"ins":{"up_context":[{"change":10,"pos":6830}],"down_context":[{"change":10,"pos":6906}],"flag":"BLOCK","start":9197,"end":9270,"inode":{"change":2,"pos":306916}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":10,"pos":6830},"to":{"change":10,"start":6830,"end":6906},"introduced_by":10}],"inode":{"change":2,"pos":306916}},"ins_contents":[{"Add":" buffer.extend_ssh_mpint(shared);"}],"del_contents":[{"Del":" buffer.extend_ssh_mpint(&shared.0);\n"}]}},{"Edit":{"inode":{"change":2,"pos":426118},"path":"ssh/Cargo.toml","line":65,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1990}],"down_context":[{"change":2,"pos":427375}],"flag":"BLOCK","start":9271,"end":9288,"inode":{"change":2,"pos":426118}}},"contents":[{"Add":"ml-kem = \"0.3.2\""}]}},{"Replacement":{"inode":{"change":2,"pos":453741},"path":"Cargo.toml","line":5,"ins":{"up_context":[{"change":8,"pos":10096}],"down_context":[{"change":12,"pos":3930}],"flag":"BLOCK","start":9289,"end":9316,"inode":{"change":2,"pos":453741}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":10096},"to":{"change":12,"start":3903,"end":3930},"introduced_by":12}],"inode":{"change":2,"pos":453741}},"ins_contents":[{"Add":"package.version = \"0.41.0\""}],"del_contents":[{"Del":"package.version = \"0.24.0\"\n"}]}},{"Replacement":{"inode":{"change":2,"pos":453741},"path":"Cargo.toml","line":10,"ins":{"up_context":[{"change":12,"pos":4028}],"down_context":[{"change":12,"pos":4085}],"flag":"BLOCK","start":9317,"end":9374,"inode":{"change":2,"pos":453741}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":12,"pos":4028},"to":{"change":12,"start":4028,"end":4085},"introduced_by":12}],"inode":{"change":2,"pos":453741}},"ins_contents":[{"Add":"thrussh-keys = { version = \"0.41.0\", path = \"ssh-keys\" }"}],"del_contents":[{"Del":"thrussh-keys = { version = \"0.24.0\", path = \"ssh-keys\" }\n"}]}}],"owner":"pijul","repo":"thrussh","token":"uEUqgZFTobiRJqy/fSRd+rnw9pYi5+lhbfdUHQGsUQ0=","login":null}

…

Dependencies

Change contents