Merge branch 'RustCrypto:master' into master

Author: maximebuyse

Cargo.lock

@@ -18,7 +18,7 @@ members = [
     "pkcs5",
     "pkcs8",
     "pkcs12",
-#    "sec1",
+    "sec1",
     "serdect",
     "spki",
     "tai64",
@@ -29,7 +29,6 @@ members = [
     "x509-cert/test-support",
     "x509-ocsp"
 ]
-exclude = ["sec1"]
 
 [profile.dev]
 opt-level = 2
@@ -52,7 +51,7 @@ pkcs1 = { path = "./pkcs1" }
 pkcs5 = { path = "./pkcs5" }
 pkcs8 = { path = "./pkcs8" }
 pkcs12 = { path = "./pkcs12" }
-#sec1 = { path = "./sec1" }
+sec1 = { path = "./sec1" }
 serdect = { path = "./serdect" }
 spki = { path = "./spki" }
 tai64 = { path = "./tai64" }

Cargo.toml

@@ -28,7 +28,7 @@ cbc = { version = "0.2.0-rc.2", optional = true }
 cipher = { version = "0.5.0-rc.3", features = ["alloc", "block-padding", "rand_core"], optional = true }
 digest = { version = "0.11.0-rc.5", optional = true }
 elliptic-curve = { version = "0.14.0-rc.21", optional = true }
-rsa = { version = "0.10.0-rc.11", optional = true }
+rsa = { version = "0.10.0-rc.13", optional = true }
 sha1 = { version = "0.11.0-rc.3", optional = true }
 sha2 = { version = "0.11.0-rc.3", optional = true }
 sha3 = { version = "0.11.0-rc.3", optional = true }
@@ -42,10 +42,10 @@ hex-literal = "1"
 pem-rfc7468 = "1"
 pkcs5 = "0.8.0-rc.12"
 pbkdf2 = "0.13.0-rc.6"
-rand = "0.10.0-rc.6"
-rsa = { version = "0.10.0-rc.11", features = ["sha2"] }
-ecdsa = { version = "0.17.0-rc.12", features = ["digest", "pem"] }
-p256 = "0.14.0-rc.4"
+rand = "0.10.0-rc.7"
+rsa = { version = "0.10.0-rc.13", features = ["sha2"] }
+ecdsa = { version = "0.17.0-rc.13", features = ["digest", "pem"] }
+p256 = "0.14.0-rc.5"
 tokio = { version = "1.45.1", features = ["macros", "rt"] }
 x509-cert = { version = "0.3.0-rc.3", features = ["pem"] }
 

cms/Cargo.toml

@@ -26,10 +26,8 @@ use alloc::{
     vec::Vec,
 };
 use cipher::{
-    BlockModeEncrypt, Iv, Key, KeyIvInit,
-    block_padding::Pkcs7,
-    crypto_common::Generate,
-    rand_core::{CryptoRng, RngCore},
+    BlockModeEncrypt, Iv, Key, KeyIvInit, block_padding::Pkcs7, crypto_common::Generate,
+    rand_core::CryptoRng,
 };
 use const_oid::ObjectIdentifier;
 use core::{cmp::Ordering, fmt, marker::PhantomData};
@@ -439,7 +437,7 @@ impl<'s> SignedDataBuilder<'s> {
         S: RandomizedSigner<Signature>,
         S::VerifyingKey: EncodePublicKey,
         Signature: SignatureBitStringEncoding,
-        R: CryptoRng + RngCore + ?Sized,
+        R: CryptoRng + ?Sized,
     {
         let signer_info = signer_info_builder
             .build_with_rng::<S, Signature, R>(signer, rng)
@@ -484,7 +482,7 @@ impl<'s> SignedDataBuilder<'s> {
         S: AsyncRandomizedSigner<Signature>,
         S::VerifyingKey: EncodePublicKey,
         Signature: SignatureBitStringEncoding,
-        R: CryptoRng + RngCore + ?Sized,
+        R: CryptoRng + ?Sized,
     {
         let signer_info = signer_info_builder
             .build_with_rng_async::<S, Signature, R>(signer, rng)
@@ -608,7 +606,7 @@ impl<'s> SignedDataBuilder<'s> {
 /// formats. All implementations must implement this trait.
 pub trait RecipientInfoBuilder {
     /// Associated Rng type
-    type Rng: CryptoRng + RngCore + ?Sized;
+    type Rng: CryptoRng + ?Sized;
 
     /// Return the recipient info type
     fn recipient_info_type(&self) -> RecipientInfoType;
@@ -670,9 +668,9 @@ impl<R> KeyTransRecipientInfoBuilder<R> {
     }
 }
 
-impl<R> RecipientInfoBuilder for KeyTransRecipientInfoBuilder<R>
+impl<R: ?Sized> RecipientInfoBuilder for KeyTransRecipientInfoBuilder<R>
 where
-    R: CryptoRng + RngCore + ?Sized,
+    R: CryptoRng,
 {
     type Rng = R;
 
@@ -741,9 +739,9 @@ impl<R> KekRecipientInfoBuilder<R> {
     }
 }
 
-impl<R> RecipientInfoBuilder for KekRecipientInfoBuilder<R>
+impl<R: ?Sized> RecipientInfoBuilder for KekRecipientInfoBuilder<R>
 where
-    R: CryptoRng + RngCore + ?Sized,
+    R: CryptoRng,
 {
     type Rng = R;
 
@@ -784,7 +782,7 @@ pub trait PwriEncryptor {
     /// including eventual parameters (e.g. the used iv).
     fn key_encryption_algorithm(&self) -> Result<AlgorithmIdentifierOwned>;
     /// Encrypt the padded content-encryption key twice following RFC 3211, § 2.3.1
-    fn encrypt_rfc3211<R: CryptoRng + RngCore + ?Sized>(
+    fn encrypt_rfc3211<R: CryptoRng + ?Sized>(
         &mut self,
         padded_content_encryption_key: &[u8],
         rng: &mut R,
@@ -832,10 +830,10 @@ where
     }
 }
 
-impl<P, R> PasswordRecipientInfoBuilder<P, R>
+impl<P, R: ?Sized> PasswordRecipientInfoBuilder<P, R>
 where
     P: PwriEncryptor,
-    R: CryptoRng + RngCore + ?Sized,
+    R: CryptoRng,
 {
     /// Wrap the content-encryption key according to [RFC 3211, §2.3.1]:
     ///     ....
@@ -876,7 +874,7 @@ where
 impl<P, R> RecipientInfoBuilder for PasswordRecipientInfoBuilder<P, R>
 where
     P: PwriEncryptor,
-    R: CryptoRng + RngCore + ?Sized,
+    R: CryptoRng + ?Sized,
 {
     type Rng = R;
 
@@ -935,7 +933,7 @@ impl<R> OtherRecipientInfoBuilder<R> {
 
 impl<R> RecipientInfoBuilder for OtherRecipientInfoBuilder<R>
 where
-    R: CryptoRng + RngCore + ?Sized,
+    R: CryptoRng + ?Sized,
 {
     type Rng = R;
 
@@ -1019,7 +1017,7 @@ impl<'c, R> EnvelopedDataBuilder<'c, R> {
 
 impl<'c, R> EnvelopedDataBuilder<'c, R>
 where
-    R: CryptoRng + RngCore + ?Sized,
+    R: CryptoRng + ?Sized,
 {
     /// Add recipient info. A builder is used, which generates a `RecipientInfo` according to
     /// RFC 5652 § 6.2, when `EnvelopedData` is built.
@@ -1216,7 +1214,7 @@ fn encrypt_data<R>(
     rng: &mut R,
 ) -> Result<(Vec<u8>, Vec<u8>, AlgorithmIdentifierOwned)>
 where
-    R: CryptoRng + RngCore + ?Sized,
+    R: CryptoRng + ?Sized,
 {
     match encryption_algorithm_identifier {
         ContentEncryptionAlgorithm::Aes128Cbc => encrypt_block_mode!(

cms/src/builder.rs

@@ -8,7 +8,7 @@
 
 // Super imports
 use super::{
-    AlgorithmIdentifierOwned, CryptoRng, RecipientInfoBuilder, RecipientInfoType, Result, RngCore,
+    AlgorithmIdentifierOwned, CryptoRng, RecipientInfoBuilder, RecipientInfoType, Result,
     UserKeyingMaterial,
     utils::kw::{KeyWrapAlgorithm, WrappedKey},
 };
@@ -250,9 +250,10 @@ where
         })
     }
 }
-impl<R, C, KA, KW, Enc> RecipientInfoBuilder for KeyAgreeRecipientInfoBuilder<R, C, KA, KW, Enc>
+impl<R: ?Sized, C, KA, KW, Enc> RecipientInfoBuilder
+    for KeyAgreeRecipientInfoBuilder<R, C, KA, KW, Enc>
 where
-    R: CryptoRng + RngCore + ?Sized,
+    R: CryptoRng,
     KA: KeyAgreementAlgorithm + AssociatedOid,
     C: CurveArithmetic + AssociatedOid + PointCompression,
     AffinePoint<C>: FromEncodedPoint<C> + ToEncodedPoint<C>,

cms/src/builder/kari.rs

@@ -23,7 +23,7 @@ use pem_rfc7468::LineEnding;
 use pkcs5::pbes2::Pbkdf2Params;
 use rand::rngs::SysRng;
 use rsa::pkcs1::DecodeRsaPrivateKey;
-use rsa::rand_core::{CryptoRng, RngCore, TryRngCore};
+use rsa::rand_core::{CryptoRng, TryRngCore};
 use rsa::{Pkcs1v15Encrypt, RsaPrivateKey, RsaPublicKey};
 use rsa::{pkcs1v15, pss};
 use sha2::Sha256;
@@ -690,10 +690,7 @@ fn test_create_password_recipient_info() {
         key_derivation_params: pkcs5::pbes2::Pbkdf2Params,
     }
     impl<'a> Aes128CbcPwriEncryptor<'a> {
-        pub fn new<R: CryptoRng + RngCore + ?Sized>(
-            challenge_password: &'a [u8],
-            rng: &mut R,
-        ) -> Self {
+        pub fn new<R: CryptoRng + ?Sized>(challenge_password: &'a [u8], rng: &mut R) -> Self {
             let mut key_encryption_iv = [0u8; 16];
             rng.fill_bytes(key_encryption_iv.as_mut_slice());
             let key_encryption_iv = key_encryption_iv.into();
@@ -711,7 +708,7 @@ fn test_create_password_recipient_info() {
     }
     impl PwriEncryptor for Aes128CbcPwriEncryptor<'_> {
         const BLOCK_LENGTH_BITS: usize = 128; // AES block length
-        fn encrypt_rfc3211<R: CryptoRng + RngCore + ?Sized>(
+        fn encrypt_rfc3211<R: CryptoRng + ?Sized>(
             &mut self,
             padded_content_encryption_key: &[u8],
             _rng: &mut R,
@@ -921,7 +918,7 @@ fn test_create_password_recipient_info() {
     let enveloped_data = builder
         .add_recipient_info(recipient_info_builder)
         .expect("Could not add a recipient info")
-        .build_with_rng(&mut the_one_and_only_rng.unwrap_mut())
+        .build_with_rng(&mut the_one_and_only_rng)
         .expect("Building EnvelopedData failed");
     let enveloped_data_der = enveloped_data
         .to_der()

cms/tests/builder.rs

@@ -20,7 +20,7 @@ subtle = { version = "2", default-features = false }
 
 # optional dependencies
 getrandom = { version = "0.4.0-rc.0", optional = true, default-features = false }
-rand_core = { version = "0.10.0-rc-3", optional = true, default-features = false }
+rand_core = { version = "0.10.0-rc-5", optional = true, default-features = false }
 
 [features]
 default = ["rand_core"]

phc/Cargo.toml

@@ -8,7 +8,7 @@ use core::{
     str::{self, FromStr},
 };
 #[cfg(feature = "rand_core")]
-use rand_core::{CryptoRng, RngCore, TryCryptoRng, TryRngCore};
+use rand_core::{CryptoRng, TryCryptoRng};
 
 /// Error message used with `expect` for when internal invariants are violated
 /// (i.e. the contents of a [`Salt`] should always be valid)
@@ -117,14 +117,14 @@ impl Salt {
 
     /// Generate a random [`Salt`] from the given [`CryptoRng`].
     #[cfg(feature = "rand_core")]
-    pub fn from_rng<R: CryptoRng + RngCore + ?Sized>(rng: &mut R) -> Self {
+    pub fn from_rng<R: CryptoRng + ?Sized>(rng: &mut R) -> Self {
         let Ok(out) = Self::try_from_rng(rng);
         out
     }
 
     /// Generate a random [`Salt`] from the given [`TryCryptoRng`].
     #[cfg(feature = "rand_core")]
-    pub fn try_from_rng<R: TryCryptoRng + TryRngCore + ?Sized>(
+    pub fn try_from_rng<R: TryCryptoRng + ?Sized>(
         rng: &mut R,
     ) -> core::result::Result<Self, R::Error> {
         let mut bytes = [0u8; Self::RECOMMENDED_LENGTH];
@@ -256,14 +256,14 @@ impl SaltString {
 
     /// Generate a random B64-encoded [`SaltString`] from [`CryptoRng`].
     #[cfg(feature = "rand_core")]
-    pub fn from_rng<R: CryptoRng + RngCore + ?Sized>(rng: &mut R) -> Self {
+    pub fn from_rng<R: CryptoRng + ?Sized>(rng: &mut R) -> Self {
         let Ok(out) = Self::try_from_rng(rng);
         out
     }
 
     /// Generate a random B64-encoded [`SaltString`] from [`TryCryptoRng`].
     #[cfg(feature = "rand_core")]
-    pub fn try_from_rng<R: TryCryptoRng + TryRngCore + ?Sized>(
+    pub fn try_from_rng<R: TryCryptoRng + ?Sized>(
         rng: &mut R,
     ) -> core::result::Result<Self, R::Error> {
         Ok(Salt::try_from_rng(rng)?.to_salt_string())

phc/src/salt.rs

@@ -25,7 +25,7 @@ aes = { version = "0.9.0-rc.2", optional = true, default-features = false }
 aes-gcm = { version = "0.11.0-rc.2", optional = true, default-features = false, features = ["aes"] }
 des = { version = "0.9.0-rc.2", optional = true, default-features = false }
 pbkdf2 = { version = "0.13.0-rc.6", optional = true, default-features = false, features = ["hmac"] }
-rand_core = { version = "0.10.0-rc-3", optional = true, default-features = false }
+rand_core = { version = "0.10.0-rc-5", optional = true, default-features = false }
 scrypt = { version = "0.12.0-rc.8", optional = true, default-features = false }
 sha1 = { version = "0.11.0-rc.3", optional = true, default-features = false }
 sha2 = { version = "0.11.0-rc.3", optional = true, default-features = false }

pkcs5/Cargo.toml

@@ -19,7 +19,7 @@ use der::{
 };
 
 #[cfg(feature = "rand_core")]
-use rand_core::{CryptoRng, RngCore};
+use rand_core::CryptoRng;
 
 #[cfg(all(feature = "alloc", feature = "pbes2"))]
 use alloc::vec::Vec;
@@ -106,7 +106,7 @@ impl Parameters {
     /// This is currently an alias for [`Parameters::scrypt`]. See that method
     /// for more information.
     #[cfg(all(feature = "pbes2", feature = "rand_core"))]
-    pub fn recommended<R: CryptoRng + RngCore + ?Sized>(rng: &mut R) -> Self {
+    pub fn recommended<R: CryptoRng>(rng: &mut R) -> Self {
         Self::scrypt(rng)
     }
 
@@ -118,7 +118,7 @@ impl Parameters {
     /// This will use AES-256-CBC as the encryption algorithm and SHA-256 as
     /// the hash function for PBKDF2.
     #[cfg(feature = "rand_core")]
-    pub fn pbkdf2<R: CryptoRng + RngCore + ?Sized>(rng: &mut R) -> Self {
+    pub fn pbkdf2<R: CryptoRng>(rng: &mut R) -> Self {
         let mut iv = [0u8; Self::DEFAULT_IV_LEN];
         rng.fill_bytes(&mut iv);
 
@@ -169,7 +169,7 @@ impl Parameters {
     ///
     /// [RustCrypto/formats#1205]: https://github.com/RustCrypto/formats/issues/1205
     #[cfg(all(feature = "pbes2", feature = "rand_core"))]
-    pub fn scrypt<R: CryptoRng + RngCore + ?Sized>(rng: &mut R) -> Self {
+    pub fn scrypt<R: CryptoRng>(rng: &mut R) -> Self {
         let mut iv = [0u8; Self::DEFAULT_IV_LEN];
         rng.fill_bytes(&mut iv);