Merge pull request #432 from gmorenz/update-x25519-dalek

yngrtc · web-flow · commit 5aa49c03a183 · 2023-04-04T08:29:37.000-07:00
Update x25519-dalek
diff --git a/dtls/Cargo.toml b/dtls/Cargo.toml
@@ -35,7 +35,7 @@ aes-gcm = "0.10.1"
 ccm = "0.3.0"
 tokio = { version = "1.19", features = ["full"] }
 async-trait = "0.1.56"
-x25519-dalek = "2.0.0-pre.1"
+x25519-dalek = { version = "2.0.0-rc.2", features = ["static_secrets"] }
 signature = "1.2.2"
 x509-parser = "0.13.2"
 der-parser = "8.1"
diff --git a/dtls/src/curve/named_curve.rs b/dtls/src/curve/named_curve.rs
@@ -54,7 +54,7 @@ fn elliptic_curve_keypair(curve: NamedCurve) -> Result<NamedCurveKeypair> {
             )
         }
         NamedCurve::X25519 => {
-            let secret_key = x25519_dalek::StaticSecret::new(OsRng);
+            let secret_key = x25519_dalek::StaticSecret::random_from_rng(OsRng);
             let public_key = x25519_dalek::PublicKey::from(&secret_key);
             (
                 public_key.as_bytes().to_vec(),

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ fn elliptic_curve_keypair(curve: NamedCurve) -> Result<NamedCurveKeypair> {`
`54`	`54`	`)`
`55`	`55`	`}`
`56`	`56`	`NamedCurve::X25519 => {`
`57`		`- let secret_key = x25519_dalek::StaticSecret::new(OsRng);`
	`57`	`+ let secret_key = x25519_dalek::StaticSecret::random_from_rng(OsRng);`
`58`	`58`	`let public_key = x25519_dalek::PublicKey::from(&secret_key);`
`59`	`59`	`(`
`60`	`60`	`public_key.as_bytes().to_vec(),`