GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix key conversion

Browse Source
This commit is contained in:
Georgio Nicolas
2026-02-19 18:56:31 +01:00
committed by Jędrzej Stuczyński
parent 27b5bde7cf
commit bf88c0c9d4
4 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+1
View File
@@ -6192,6 +6192,7 @@ dependencies = [
"hkdf",
"hmac",
"jwt-simple",
"libcrux-curve25519",
"libcrux-psq",
"nym-pemstore",
"nym-sphinx-types",
Cargo.toml
+1
View File
@@ -399,6 +399,7 @@ prometheus = { version = "0.14.0" }
# libcrux
libcrux-kem = { git = "https://github.com/jstuczyn/libcrux", branch = "jstuczyn/exposed-transport" }
libcrux-ecdh = { git = "https://github.com/jstuczyn/libcrux", branch = "jstuczyn/exposed-transport" }
libcrux-curve25519 = { git = "https://github.com/jstuczyn/libcrux", branch = "jstuczyn/exposed-transport" }
libcrux-chacha20poly1305 = { git = "https://github.com/jstuczyn/libcrux", branch = "jstuczyn/exposed-transport" }
libcrux-psq = { git = "https://github.com/jstuczyn/libcrux", branch = "jstuczyn/exposed-transport" }
libcrux-ml-kem = { git = "https://github.com/jstuczyn/libcrux", branch = "jstuczyn/exposed-transport" }
common/crypto/Cargo.toml
+1
View File
@@ -22,6 +22,7 @@ hkdf = { workspace = true, optional = true }
hmac = { workspace = true, optional = true }
jwt-simple = { workspace = true, optional = true }
libcrux-psq = { workspace = true, optional = true }
libcrux-curve25519 = { workspace = true }
cipher = { workspace = true, optional = true }
x25519-dalek = { workspace = true, features = ["static_secrets"], optional = true }
ed25519-dalek = { workspace = true, features = ["rand_core"], optional = true }
common/crypto/src/asymmetric/x25519/mod.rs
+24 -9
View File
@@ -417,11 +417,9 @@ impl AsRef<[u8]> for PrivateKey {
#[cfg(feature = "libcrux_x25519")]
impl From<PrivateKey> for libcrux_psq::handshake::types::DHPrivateKey {
fn from(key: PrivateKey) -> libcrux_psq::handshake::types::DHPrivateKey {
todo!("libcrux requires clamping")
// // SAFETY: we're using valid x25519 private key
// #[allow(clippy::unwrap_used)]
// libcrux_psq::handshake::types::DHPrivateKey::from_bytes(key.as_bytes()).unwrap()
Self::from(&key)
}
}
@@ -429,7 +427,7 @@ impl From<PrivateKey> for libcrux_psq::handshake::types::DHPrivateKey {
impl From<libcrux_psq::handshake::types::DHPrivateKey> for PrivateKey {
fn from(key: libcrux_psq::handshake::types::DHPrivateKey) -> PrivateKey {
// SAFETY: we're using valid x25519 private key
#[allow(clippy::unwrap_used)]
// #[allow(clippy::unwrap_used)]
PrivateKey::from_bytes(key.as_ref()).unwrap()
}
}
@@ -437,10 +435,14 @@ impl From<libcrux_psq::handshake::types::DHPrivateKey> for PrivateKey {
#[cfg(feature = "libcrux_x25519")]
impl From<&PrivateKey> for libcrux_psq::handshake::types::DHPrivateKey {
fn from(key: &PrivateKey) -> libcrux_psq::handshake::types::DHPrivateKey {
todo!("libcrux requires clamping")
// // SAFETY: we're using valid x25519 private key
// SAFETY: we're using valid x25519 private key
// #[allow(clippy::unwrap_used)]
// libcrux_psq::handshake::types::DHPrivateKey::from_bytes(key.as_bytes()).unwrap()
let mut private_key_bytes = key.to_bytes();
libcrux_curve25519::clamp(&mut private_key_bytes);
let libcrux_private_key = libcrux_psq::handshake::types::DHPrivateKey::from_bytes(&private_key_bytes).unwrap();
private_key_bytes.zeroize();
libcrux_private_key
}
}
@@ -448,7 +450,7 @@ impl From<&PrivateKey> for libcrux_psq::handshake::types::DHPrivateKey {
impl From<&libcrux_psq::handshake::types::DHPrivateKey> for PrivateKey {
fn from(key: &libcrux_psq::handshake::types::DHPrivateKey) -> PrivateKey {
// SAFETY: we're using valid x25519 private key
#[allow(clippy::unwrap_used)]
// #[allow(clippy::unwrap_used)]
PrivateKey::from_bytes(key.as_ref()).unwrap()
}
}
@@ -464,7 +466,7 @@ impl From<PublicKey> for libcrux_psq::handshake::types::DHPublicKey {
impl From<libcrux_psq::handshake::types::DHPublicKey> for PublicKey {
fn from(key: libcrux_psq::handshake::types::DHPublicKey) -> PublicKey {
// SAFETY: we're using correct 32 bytes representation
#[allow(clippy::unwrap_used)]
// #[allow(clippy::unwrap_used)]
PublicKey::from_bytes(key.as_ref()).unwrap()
}
}
@@ -494,6 +496,19 @@ mod tests {
fn assert_zeroize<T: Zeroize>() {}
#[test]
fn test_key_conversion(){
let dalek_kp = super::KeyPair::new(&mut rand::thread_rng());
let mut dalek_private_key_bytes = dalek_kp.private_key().as_bytes().to_owned();
libcrux_curve25519::clamp(&mut dalek_private_key_bytes);
let libcrux_private_key = libcrux_psq::handshake::types::DHPrivateKey::from_bytes(&dalek_private_key_bytes).unwrap();
let libcrux_public_key = libcrux_private_key.to_public();
assert_eq!(libcrux_public_key.as_ref(), dalek_kp.public_key.as_bytes());
}
#[test]
fn private_key_is_zeroized() {
assert_zeroize::<PrivateKey>();
assert_zeroize_on_drop::<PrivateKey>();