fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-27 08:41:36 +00:00
Code Issues Projects Releases Wiki Activity

feat(noise): remove tests for deprecated protocol

Browse Source 
With `0.51`, we finally officially deprecated the non-spec compliant version of noise. This one needs a very heavy dependency for testing: `libsodium-sys-stable`.

I propose to remove the tests now. The actual implementation is not yet removed because it would be a breaking change. Once we decide to make the next breaking change, we can also include the removal of the deprecated API.

Pull-Request: #3510.
This commit is contained in:
Thomas Eizinger
2023-03-08 00:30:47 +11:00
committed by GitHub
parent d529945286
commit 6b73dac59b
3 changed files with 0 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
transports/noise/Cargo.toml
View File

@ -31,10 +31,8 @@ snow = { version = "0.9.0", features = ["default-resolver"], default-features =
[dev-dependencies]
async-io = "1.2.0"
ed25519-compact = "2.0.4"
env_logger = "0.10.0"
libp2p-tcp = { path = "../tcp", features = ["async-io"] }
libsodium-sys-stable = { version = "1.19.22", features = ["fetch-latest"] }
quickcheck = { package = "quickcheck-ext", path = "../../misc/quickcheck-ext" }
# Passing arguments to the docsrs builder in order to properly document cfg's.

58
transports/noise/src/protocol/x25519.rs
View File

@ -281,44 +281,8 @@ impl snow::types::Dh for Keypair<X25519> {
#[cfg(test)]
mod tests {
use super::*;
// Use the ed25519_compact for testing
use ed25519_compact;
use libp2p_core::identity::ed25519;
// Use the libsodium-sys-stable crypto_sign imports for testing
use libsodium_sys::crypto_sign_ed25519_pk_to_curve25519;
use libsodium_sys::crypto_sign_ed25519_sk_to_curve25519;
use quickcheck::*;
use x25519_dalek::StaticSecret;
// ed25519 to x25519 keypair conversion must yield the same results as
// obtained through libsodium.
#[test]
fn prop_ed25519_to_x25519_matches_libsodium() {
fn prop() -> bool {
let ed25519 = ed25519::Keypair::generate();
let x25519 = Keypair::from(SecretKey::from_ed25519(&ed25519.secret()));
let sodium_sec =
ed25519_sk_to_curve25519(&ed25519_compact::SecretKey::new(ed25519.encode()));
let sodium_pub = ed25519_pk_to_curve25519(&ed25519_compact::PublicKey::new(
ed25519.public().encode(),
));
let our_pub = x25519.public.0;
// libsodium does the [clamping] of the scalar upon key construction,
// just like x25519-dalek, but this module uses the raw byte-oriented x25519
// function from x25519-dalek, as defined in RFC7748, so "our" secret scalar
// must be clamped before comparing it to the one computed by libsodium.
// That happens in `StaticSecret::from`.
//
// [clamping]: http://www.lix.polytechnique.fr/~smith/ECC/#scalar-clamping
let our_sec = StaticSecret::from((x25519.secret.0).0).to_bytes();
sodium_sec.as_ref() == Some(&our_sec) && sodium_pub.as_ref() == Some(&our_pub.0)
}
quickcheck(prop as fn() -> _);
}
// The x25519 public key obtained through ed25519 keypair conversion
// (and thus derived from the converted secret key) must match the x25519
@ -334,26 +298,4 @@ mod tests {
quickcheck(prop as fn() -> _);
}
pub fn ed25519_pk_to_curve25519(k: &ed25519_compact::PublicKey) -> Option<[u8; 32]> {
let mut out = [0u8; 32];
unsafe {
if crypto_sign_ed25519_pk_to_curve25519(out.as_mut_ptr(), k.as_ptr()) == 0 {
Some(out)
} else {
None
}
}
}
pub fn ed25519_sk_to_curve25519(k: &ed25519_compact::SecretKey) -> Option<[u8; 32]> {
let mut out = [0u8; 32];
unsafe {
if crypto_sign_ed25519_sk_to_curve25519(out.as_mut_ptr(), k.as_ptr()) == 0 {
Some(out)
} else {
None
}
}
}
}