chore: fix README package name, enable zeroize on crates, rand_core removed for reexport (#4)

Reviewed-on: #4
Co-authored-by: UneBaguette <[email protected]>
Co-committed-by: UneBaguette <[email protected]>

src/key_exchange/group/ed25519.rs

@@ -429,8 +429,8 @@ mod test {
     use std::iter;
 
     use ed25519_dalek::{Signer, SigningKey, Verifier, VerifyingKey};
+    use rand::rand_core::UnwrapErr;
     use rand::rngs::SysRng;
-    use rand_core::UnwrapErr;
 
     use super::*;
 

src/key_exchange/sigma_i/ecdsa.rs

@@ -111,8 +111,8 @@ fn ecdsa() {
     use p256::ecdsa::signature::RandomizedDigestSigner;
     use p256::ecdsa::{Signature, SigningKey, VerifyingKey};
     use p256::{NistP256, PublicKey};
+    use rand::rand_core::UnwrapErr;
     use rand::rngs::SysRng;
-    use rand_core::UnwrapErr;
     use sha2::Sha256;
 
     use crate::tests::mock_rng::CycleRng;

src/key_exchange/tripledh_kem.rs

@@ -116,7 +116,7 @@ pub trait KemCoreWrapper {
 /// which is required by `ml-kem 0.3.x`.
 struct RngCompat<'a, R>(&'a mut R);
 
-impl<R: Rng> rand_core::TryRng for RngCompat<'_, R> {
+impl<R: Rng> rand::rand_core::TryRng for RngCompat<'_, R> {
     type Error = core::convert::Infallible;
 
     fn try_next_u32(&mut self) -> Result<u32, Self::Error> {
@@ -133,7 +133,7 @@ impl<R: Rng> rand_core::TryRng for RngCompat<'_, R> {
     }
 }
 
-impl<R: Rng + CryptoRng> rand_core::TryCryptoRng for RngCompat<'_, R> {}
+impl<R: Rng + CryptoRng> rand::rand_core::TryCryptoRng for RngCompat<'_, R> {}
 
 type RcEncapsulationKeyLen<K> = <<K as MlKemTrait>::EncapsulationKey as KeySizeUser>::KeySize;
 #[allow(deprecated)]

src/keypair.rs

@@ -307,8 +307,8 @@ mod tests {
         ServerRegistrationStartResult, ServerSetup,
     };
     use hkdf::Hkdf;
+    use rand::rand_core::UnwrapErr;
     use rand::rngs::SysRng;
-    use rand_core::UnwrapErr;
 
     macro_rules! test {
         ($mod:ident, $point:ty) => {

src/lib.rs

@@ -64,7 +64,7 @@
 //! # }
 //! use rand::Rng;
 //! use rand::rngs::SysRng;
-//! use rand_core::UnwrapErr;
+//! use rand::rand_core::UnwrapErr;
 //!
 //! let mut rng = UnwrapErr(SysRng);
 //! let server_setup = ServerSetup::<Default>::new(&mut rng);
@@ -122,7 +122,7 @@
 //! use opaque_vx::ClientRegistration;
 //! use rand::Rng;
 //! use rand::rngs::SysRng;
-//! use rand_core::UnwrapErr;
+//! use rand::rand_core::UnwrapErr;
 //!
 //! let mut client_rng = UnwrapErr(SysRng);
 //! let client_registration_start_result =
@@ -159,7 +159,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # let mut client_rng = UnwrapErr(SysRng);
 //! # let client_registration_start_result = ClientRegistration::<Default>::start(
 //! #     &mut client_rng,
@@ -207,7 +207,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # let mut client_rng = UnwrapErr(SysRng);
 //! # let client_registration_start_result = ClientRegistration::<Default>::start(
 //! #     &mut client_rng,
@@ -256,7 +256,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # let mut client_rng = UnwrapErr(SysRng);
 //! # let client_registration_start_result = ClientRegistration::<Default>::start(
 //! #     &mut client_rng,
@@ -308,7 +308,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! use opaque_vx::ClientLogin;
 //!
 //! let mut client_rng = UnwrapErr(SysRng);
@@ -345,7 +345,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # let mut client_rng = UnwrapErr(SysRng);
 //! # let client_registration_start_result = ClientRegistration::<Default>::start(
 //! #     &mut client_rng,
@@ -416,7 +416,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # let mut client_rng = UnwrapErr(SysRng);
 //! # let client_registration_start_result = ClientRegistration::<Default>::start(
 //! #     &mut client_rng,
@@ -474,7 +474,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # let mut client_rng = UnwrapErr(SysRng);
 //! # let client_registration_start_result = ClientRegistration::<Default>::start(
 //! #     &mut client_rng,
@@ -572,7 +572,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # let mut client_rng = UnwrapErr(SysRng);
 //! # let client_registration_start_result = ClientRegistration::<Default>::start(
 //! #     &mut client_rng,
@@ -670,7 +670,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # let mut client_rng = UnwrapErr(SysRng);
 //! # let client_registration_start_result = ClientRegistration::<Default>::start(
 //! #     &mut client_rng,
@@ -783,7 +783,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # let mut client_rng = UnwrapErr(SysRng);
 //! # let client_registration_start_result = ClientRegistration::<Default>::start(
 //! #     &mut client_rng,
@@ -830,7 +830,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # let mut client_rng = UnwrapErr(SysRng);
 //! # let client_registration_start_result = ClientRegistration::<Default>::start(
 //! #     &mut client_rng,
@@ -888,7 +888,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # let mut client_rng = UnwrapErr(SysRng);
 //! # let client_registration_start_result = ClientRegistration::<Default>::start(
 //! #     &mut client_rng,
@@ -948,7 +948,7 @@
 //! #     type Ksf = opaque_vx::ksf::Identity;
 //! # }
 //! # use rand::{rngs::SysRng, Rng};
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # let mut client_rng = UnwrapErr(SysRng);
 //! # let client_registration_start_result = ClientRegistration::<Default>::start(
 //! #     &mut client_rng,
@@ -1021,7 +1021,7 @@
 //! # use generic_array::{GenericArray, typenum::U0};
 //! # use opaque_vx::{CipherSuite, ClientLogin, ClientRegistration, ClientRegistrationFinishParameters, ServerRegistration, keypair::{PrivateKey, PublicKey}, key_exchange::{KeyExchange, group::Group, tripledh::DiffieHellman}};
 //! # use rand::rngs::SysRng;
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //!
 //! type Ristretto255 = <<Default as CipherSuite>::KeyExchange as KeyExchange>::Group;
 //! # struct Default;
@@ -1118,7 +1118,7 @@
 //! # use opaque_vx::{CipherSuite, ClientLogin, ClientRegistration, ClientRegistrationFinishParameters, keypair::{PrivateKey, PublicKey}, key_exchange::{KeyExchange, group::Group, tripledh::DiffieHellman}};
 //! # use rand::rngs::SysRng;
 //! # use rand::Rng;
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //!
 //! type Ristretto255 = <<Default as CipherSuite>::KeyExchange as KeyExchange>::Group;
 //! # type Hash = <<Default as CipherSuite>::KeyExchange as KeyExchange>::Hash;
@@ -1277,7 +1277,7 @@
 //! # use opaque_vx::errors::ProtocolError;
 //! # use rand::rngs::SysRng;
 //! # use rand::Rng;
-//! # use rand_core::UnwrapErr;
+//! # use rand::rand_core::UnwrapErr;
 //! # use std::default::Default;
 //! # #[cfg(feature = "argon2")]
 //! # {

src/serialization/tests.rs

@@ -12,8 +12,8 @@ use generic_array::typenum::{Sum, Unsigned};
 use proptest::collection::vec;
 use proptest::prelude::*;
 use rand::Rng;
+use rand::rand_core::UnwrapErr;
 use rand::rngs::SysRng;
-use rand_core::UnwrapErr;
 use voprf::Group as _;
 
 use crate::ciphersuite::{CipherSuite, KeGroup, OprfGroup, OprfHash};

src/tests/full_test.rs

@@ -15,9 +15,9 @@ use generic_array::{ArrayLength, GenericArray};
 #[cfg(feature = "kem")]
 use ml_kem::MlKem768;
 use rand::SeedableRng;
+use rand::rand_core::UnwrapErr;
 use rand::rngs::SysRng;
 use rand_chacha::ChaCha20Rng;
-use rand_core::UnwrapErr;
 use serde_json::Value;
 use subtle::ConstantTimeEq;
 use voprf::Group as _;

src/tests/mock_rng.rs

@@ -6,7 +6,7 @@ use core::cmp::min;
 use std::vec::Vec;
 
 use core::convert::Infallible;
-use rand_core::{TryCryptoRng, TryRng};
+use rand::rand_core::{TryCryptoRng, TryRng};
 
 /// A simple implementation of `Rng` for testing purposes.
 ///

src/tests/test_opaque_vectors.rs

@@ -26,8 +26,8 @@ use digest::OutputSizeUser;
 use generic_array::typenum::Sum;
 use generic_array::{ArrayLength, GenericArray};
 use rand::Rng;
+use rand::rand_core::UnwrapErr;
 use rand::rngs::SysRng;
-use rand_core::UnwrapErr;
 use serde_json::Value;
 
 #[allow(non_snake_case)]