Skip to content

Commit f1b052c

Browse files
authored
Bump rand_core to v0.10.0-rc-3 (#2138)
1 parent 02eb077 commit f1b052c

File tree

5 files changed

+36
-33
lines changed

5 files changed

+36
-33
lines changed

Cargo.lock

Lines changed: 22 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,7 @@ tls_codec_derive = { path = "./tls_codec/derive" }
6060
x509-tsp = { path = "./x509-tsp" }
6161
x509-cert = { path = "./x509-cert" }
6262
x509-ocsp = { path = "./x509-ocsp" }
63+
64+
# https://github.com/rust-random/rand/pull/1697
65+
rand = { git = "https://github.com/rust-random/rand", rev = "99ae06fb348e5c5fee0fe41d2201bd4cbb107635" }
66+
getrandom = { git = "https://github.com/rust-random/getrandom.git", rev = "f67c70110f706f80d7dd6fa52e38d0920754fe2c" }

cms/tests/builder.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use der::{Any, AnyRef, Decode, DecodePem, Encode, Tag, Tagged};
2121
use p256::{NistP256, pkcs8::DecodePrivateKey};
2222
use pem_rfc7468::LineEnding;
2323
use pkcs5::pbes2::Pbkdf2Params;
24-
use rand::rngs::OsRng;
24+
use rand::rngs::SysRng;
2525
use rsa::pkcs1::DecodeRsaPrivateKey;
2626
use rsa::rand_core::{CryptoRng, TryRngCore};
2727
use rsa::{Pkcs1v15Encrypt, RsaPrivateKey, RsaPublicKey};
@@ -159,7 +159,7 @@ fn test_build_signed_data() {
159159
.add_signer_info_with_rng::<pss::SigningKey<Sha256>, pss::Signature, _>(
160160
signer_info_builder_3,
161161
&signer_3,
162-
&mut OsRng.unwrap_err(),
162+
&mut SysRng.unwrap_err(),
163163
)
164164
.expect("error adding PKCS1v15 RSA signer info")
165165
.build()
@@ -183,7 +183,7 @@ fn test_build_signed_data() {
183183
#[test]
184184
fn test_build_enveloped_data() {
185185
let recipient_identifier = recipient_identifier(1);
186-
let mut rng = OsRng.unwrap_err();
186+
let mut rng = SysRng.unwrap_err();
187187
let bits = 2048;
188188
let recipient_private_key =
189189
RsaPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
@@ -195,7 +195,7 @@ fn test_build_enveloped_data() {
195195
)
196196
.expect("Could not create a KeyTransRecipientInfoBuilder");
197197

198-
let mut rng = OsRng.unwrap_err();
198+
let mut rng = SysRng.unwrap_err();
199199
let mut builder = EnvelopedDataBuilder::new(
200200
None,
201201
"Arbitrary unencrypted content".as_bytes(),
@@ -657,7 +657,7 @@ async fn async_builder() {
657657
.add_signer_info_with_rng_async::<pss::SigningKey<Sha256>, pss::Signature, _>(
658658
signer_info_builder_3,
659659
&signer_3,
660-
&mut OsRng.unwrap_err(),
660+
&mut SysRng.unwrap_err(),
661661
)
662662
.await
663663
.expect("error adding PKCS1v15 RSA signer info")
@@ -897,7 +897,7 @@ fn test_create_password_recipient_info() {
897897
content_encryption_key
898898
}
899899

900-
let mut the_one_and_only_rng = OsRng.unwrap_err();
900+
let mut the_one_and_only_rng = SysRng.unwrap_err();
901901

902902
// Encrypt the content-encryption key (CEK) using custom encryptor
903903
// of type `Aes128CbcPwriEncryptor`:

cms/tests/builder/kari.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use cms::{
1111
use der::{Any, AnyRef, Encode};
1212
use p256::{SecretKey, pkcs8::DecodePrivateKey};
1313
use pem_rfc7468::LineEnding;
14-
use rand::{TryRngCore, rngs::OsRng};
14+
use rand::{TryRngCore, rngs::SysRng};
1515
use x509_cert::serial_number::SerialNumber;
1616

1717
fn key_agreement_recipient_identifier(id: i32) -> KeyAgreeRecipientIdentifier {
@@ -55,7 +55,7 @@ fn test_build_enveloped_data_ec() {
5555
.expect("Could not create a KeyAgreeRecipientInfoBuilder");
5656

5757
// Enveloped data builder
58-
let mut rng = OsRng.unwrap_err();
58+
let mut rng = SysRng.unwrap_err();
5959
let mut builder = EnvelopedDataBuilder::new(
6060
None,
6161
"Arbitrary unencrypted content, encrypted using ECC".as_bytes(),

x509-cert/tests/builder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use der::{
66
pem::LineEnding,
77
};
88
use p256::{NistP256, ecdsa::DerSignature, pkcs8::DecodePrivateKey};
9-
use rand::rngs::OsRng;
9+
use rand::rngs::SysRng;
1010
use rsa::pkcs1::DecodeRsaPrivateKey;
1111
use rsa::pkcs1v15::SigningKey;
1212
use sha2::Sha256;
@@ -316,7 +316,7 @@ fn dynamic_signer() {
316316
let csr_builder = RequestBuilder::new(subject).expect("construct builder");
317317

318318
let csr = if true {
319-
let req_signer = p256::ecdsa::SigningKey::try_from_rng(&mut OsRng).unwrap();
319+
let req_signer = p256::ecdsa::SigningKey::try_from_rng(&mut SysRng).unwrap();
320320
csr_builder
321321
.build::<_, p256::ecdsa::DerSignature>(&req_signer)
322322
.expect("Sign request")

0 commit comments

Comments
 (0)