pkcs5,pkcs8: bump rand_core from 0.6.4 to 0.9.0

RustCrypto · Feb 14, 2025 · a178416 · a178416
1 parent c2bbe33
commit a178416
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pkcs5/Cargo.toml b/pkcs5/Cargo.toml
@@ -25,7 +25,7 @@ aes = { version = "=0.9.0-pre.2", optional = true, default-features = false }
 aes-gcm = { version = "=0.11.0-pre.2", optional = true, default-features = false, features = ["aes"] }
 des = { version = "=0.9.0-pre.2", optional = true, default-features = false }
 pbkdf2 = { version = "=0.13.0-pre.1", optional = true, default-features = false, features = ["hmac"] }
-rand_core = { version = "0.6.4", optional = true, default-features = false }
+rand_core = { version = "0.9.0", optional = true, default-features = false }
 scrypt = { version = "=0.12.0-pre.2", optional = true, default-features = false }
 sha1 = { version = "=0.11.0-pre.4", optional = true, default-features = false }
 sha2 = { version = "=0.11.0-pre.4", optional = true, default-features = false }
@@ -39,7 +39,7 @@ std = []
 
 3des = ["dep:des", "pbes2"]
 des-insecure = ["dep:des", "pbes2"]
-getrandom = ["rand_core/getrandom"]
+getrandom = ["rand_core/os_rng"]
 pbes2 = ["dep:aes", "dep:cbc", "dep:pbkdf2", "dep:scrypt", "dep:sha2", "dep:aes-gcm"]
 sha1-insecure = ["dep:sha1", "pbes2"]
 

diff --git a/pkcs5/src/pbes2.rs b/pkcs5/src/pbes2.rs
@@ -19,7 +19,7 @@ use der::{
 };
 
 #[cfg(feature = "rand_core")]
-use rand_core::CryptoRngCore;
+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(rng: &mut impl CryptoRngCore) -> 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(rng: &mut impl CryptoRngCore) -> 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(rng: &mut impl CryptoRngCore) -> Self {
+    pub fn scrypt<R: CryptoRng>(rng: &mut R) -> Self {
         let mut iv = [0u8; Self::DEFAULT_IV_LEN];
         rng.fill_bytes(&mut iv);
 

diff --git a/pkcs8/Cargo.toml b/pkcs8/Cargo.toml
@@ -21,7 +21,7 @@ der = { version = "0.8.0-rc.0", features = ["oid"] }
 spki = { version = "0.8.0-rc.0" }
 
 # optional dependencies
-rand_core = { version = "0.6", optional = true, default-features = false }
+rand_core = { version = "0.9.0", optional = true, default-features = false }
 pkcs5 = { version = "0.8.0-rc.0", optional = true, features = ["rand_core"] }
 subtle = { version = "2", optional = true, default-features = false }
 
@@ -36,7 +36,7 @@ std = ["alloc", "der/std", "spki/std"]
 3des = ["encryption", "pkcs5/3des"]
 des-insecure = ["encryption", "pkcs5/des-insecure"]
 encryption = ["alloc", "pkcs5/alloc", "pkcs5/pbes2", "rand_core"]
-getrandom = ["rand_core/getrandom"]
+getrandom = ["rand_core/os_rng"]
 pem = ["alloc", "der/pem", "spki/pem"]
 sha1-insecure = ["encryption", "pkcs5/sha1-insecure"]
 

diff --git a/pkcs8/src/encrypted_private_key_info.rs b/pkcs8/src/encrypted_private_key_info.rs
@@ -12,7 +12,7 @@ use pkcs5::EncryptionScheme;
 use der::{asn1::OctetString, SecretDocument};
 
 #[cfg(feature = "encryption")]
-use {pkcs5::pbes2, rand_core::CryptoRngCore};
+use {pkcs5::pbes2, rand_core::CryptoRng};
 
 #[cfg(feature = "pem")]
 use der::pem::PemLabel;
@@ -64,8 +64,8 @@ where
     /// Encrypt the given ASN.1 DER document using a symmetric encryption key
     /// derived from the provided password.
     #[cfg(feature = "encryption")]
-    pub(crate) fn encrypt(
-        rng: &mut impl CryptoRngCore,
+    pub(crate) fn encrypt<R: CryptoRng>(
+        rng: &mut R,
         password: impl AsRef<[u8]>,
         doc: &[u8],
     ) -> Result<SecretDocument> {

diff --git a/pkcs8/src/private_key_info.rs b/pkcs8/src/private_key_info.rs
@@ -17,8 +17,7 @@ use der::{
 
 #[cfg(feature = "encryption")]
 use {
-    crate::EncryptedPrivateKeyInfoRef, der::zeroize::Zeroizing, pkcs5::pbes2,
-    rand_core::CryptoRngCore,
+    crate::EncryptedPrivateKeyInfoRef, der::zeroize::Zeroizing, pkcs5::pbes2, rand_core::CryptoRng,
 };
 
 #[cfg(feature = "pem")]
@@ -146,9 +145,9 @@ where
     ///   - p: 1
     /// - Cipher: AES-256-CBC (best available option for PKCS#5 encryption)
     #[cfg(feature = "encryption")]
-    pub fn encrypt(
+    pub fn encrypt<R: CryptoRng>(
         &self,
-        rng: &mut impl CryptoRngCore,
+        rng: &mut R,
         password: impl AsRef<[u8]>,
     ) -> Result<SecretDocument> {
         let der = Zeroizing::new(self.to_der()?);

diff --git a/pkcs8/src/traits.rs b/pkcs8/src/traits.rs
@@ -6,7 +6,7 @@ use crate::{Error, PrivateKeyInfoRef, Result};
 use der::SecretDocument;
 
 #[cfg(feature = "encryption")]
-use {crate::EncryptedPrivateKeyInfoRef, rand_core::CryptoRngCore};
+use {crate::EncryptedPrivateKeyInfoRef, rand_core::CryptoRng};
 
 #[cfg(feature = "pem")]
 use {
@@ -101,9 +101,9 @@ pub trait EncodePrivateKey {
     /// Create an [`SecretDocument`] containing the ciphertext of
     /// a PKCS#8 encoded private key encrypted under the given `password`.
     #[cfg(feature = "encryption")]
-    fn to_pkcs8_encrypted_der(
+    fn to_pkcs8_encrypted_der<R: CryptoRng>(
         &self,
-        rng: &mut impl CryptoRngCore,
+        rng: &mut R,
         password: impl AsRef<[u8]>,
     ) -> Result<SecretDocument> {
         EncryptedPrivateKeyInfoRef::encrypt(rng, password, self.to_pkcs8_der()?.as_bytes())
@@ -119,9 +119,9 @@ pub trait EncodePrivateKey {
     /// Serialize this private key as an encrypted PEM-encoded PKCS#8 private
     /// key using the `provided` to derive an encryption key.
     #[cfg(all(feature = "encryption", feature = "pem"))]
-    fn to_pkcs8_encrypted_pem(
+    fn to_pkcs8_encrypted_pem<R: CryptoRng>(
         &self,
-        rng: &mut impl CryptoRngCore,
+        rng: &mut R,
         password: impl AsRef<[u8]>,
         line_ending: LineEnding,
     ) -> Result<Zeroizing<String>> {