Merge branch 'master' into ci/activate-dependabot

cloudflare · Oct 20, 2023 · b06a290 · b06a290
2 parents 02bdb3f + e3252d9
commit b06a290
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/boringtun/Cargo.toml b/boringtun/Cargo.toml
@@ -30,7 +30,7 @@ tracing = "0.1.29"
 tracing-subscriber = { version = "0.3", features = ["fmt"], optional = true }
 ip_network = "0.4.1"
 ip_network_table = "0.2.0"
-ring = "0.16"
+ring = "0.17"
 x25519-dalek = { version = "2.0.0", features = [
     "reusable_secrets",
     "static_secrets",

diff --git a/boringtun/benches/crypto_benches/x25519_shared_key_benching.rs b/boringtun/benches/crypto_benches/x25519_shared_key_benching.rs
@@ -37,13 +37,8 @@ pub fn bench_x25519_shared_key(c: &mut Criterion) {
                     .unwrap()
             },
             |my_private_key| {
-                ring::agreement::agree_ephemeral(
-                    my_private_key,
-                    &my_public_key,
-                    ring::error::Unspecified,
-                    |_key_material| Ok(()),
-                )
-                .unwrap()
+                ring::agreement::agree_ephemeral(my_private_key, &my_public_key, |_key_material| ())
+                    .unwrap()
             },
             BatchSize::SmallInput,
         );