Updated x25519-dalek dependency to 2.0.0 (#46)

* Updated x25519-dalek dependency to 2.0.0 * Fixed the `ambiguous-glob-reexports` clippy warning * Removed spurious compiler warning * Updated CHANGELOG --------- Co-authored-by: Michael Rosenberg <michael@mrosenberg.pub>
rozbb · Sep 15, 2023 · 9ec18f1 · 9ec18f1
1 parent 2867b0a
commit 9ec18f1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Removals
+
+* Removed the redundant re-export of the first encapsulated key type as `kem::EncappedKey`
+
+### Changes
+
+* Updated `x25519-dalek` to 2.0
+
 ## [0.10.0] - 2022-10-01
 
 ### Additions

diff --git a/Cargo.toml b/Cargo.toml
@@ -41,14 +41,9 @@ p384 = { version = "0.13", default-features = false, features = ["arithmetic", "
 sha2 = { version = "0.10", default-features = false }
 serde = { version = "1.0", default-features = false, optional = true }
 subtle = { version = "2.4", default-features = false }
+x25519-dalek = { version = "2", default-features = false, features = ["static_secrets"], optional = true }
 zeroize = { version = "1", default-features = false, features = ["zeroize_derive"] }
 
-[dependencies.x25519-dalek]
-version = "2.0.0-pre.1"
-default-features = false
-features = ["u64_backend"]
-optional = true
-
 [dev-dependencies]
 criterion = { version = "0.4", features = ["html_reports"] }
 hex = "0.4"

diff --git a/src/kem/dhkem.rs b/src/kem/dhkem.rs
@@ -8,9 +8,7 @@ macro_rules! impl_dhkem {
         $kem_id:literal,
         $doc_str:expr
     ) => {
-
-        // Export everything from the crate we define
-        pub use $mod_name::*;
+        pub use $mod_name::$kem_name;
 
         pub(crate) mod $mod_name {
             use crate::{

diff --git a/src/single_shot.rs b/src/single_shot.rs
@@ -151,7 +151,6 @@ mod test {
     use super::*;
     use crate::{
         aead::ChaCha20Poly1305,
-        kdf::{HkdfSha256, HkdfSha384},
         kem::Kem as KemTrait,
         op_mode::{OpModeR, OpModeS, PskBundle},
         test_util::gen_rand_buf,
@@ -229,23 +228,23 @@ mod test {
     test_single_shot_correctness!(
         test_single_shot_correctness_x25519,
         ChaCha20Poly1305,
-        HkdfSha256,
+        crate::kdf::HkdfSha256,
         crate::kem::x25519_hkdfsha256::X25519HkdfSha256
     );
 
     #[cfg(feature = "p256")]
     test_single_shot_correctness!(
         test_single_shot_correctness_p256,
         ChaCha20Poly1305,
-        HkdfSha256,
+        crate::kdf::HkdfSha256,
         crate::kem::dhp256_hkdfsha256::DhP256HkdfSha256
     );
 
     #[cfg(feature = "p384")]
     test_single_shot_correctness!(
         test_single_shot_correctness_p384,
         ChaCha20Poly1305,
-        HkdfSha384,
+        crate::kdf::HkdfSha384,
         crate::kem::dhp384_hkdfsha384::DhP384HkdfSha384
     );
 }