Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 22 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,7 @@ tls_codec_derive = { path = "./tls_codec/derive" }
x509-tsp = { path = "./x509-tsp" }
x509-cert = { path = "./x509-cert" }
x509-ocsp = { path = "./x509-ocsp" }

# https://github.com/rust-random/rand/pull/1697
rand = { git = "https://github.com/rust-random/rand", rev = "99ae06fb348e5c5fee0fe41d2201bd4cbb107635" }
getrandom = { git = "https://github.com/rust-random/getrandom.git", rev = "f67c70110f706f80d7dd6fa52e38d0920754fe2c" }
12 changes: 6 additions & 6 deletions cms/tests/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use der::{Any, AnyRef, Decode, DecodePem, Encode, Tag, Tagged};
use p256::{NistP256, pkcs8::DecodePrivateKey};
use pem_rfc7468::LineEnding;
use pkcs5::pbes2::Pbkdf2Params;
use rand::rngs::OsRng;
use rand::rngs::SysRng;
use rsa::pkcs1::DecodeRsaPrivateKey;
use rsa::rand_core::{CryptoRng, TryRngCore};
use rsa::{Pkcs1v15Encrypt, RsaPrivateKey, RsaPublicKey};
Expand Down Expand Up @@ -159,7 +159,7 @@ fn test_build_signed_data() {
.add_signer_info_with_rng::<pss::SigningKey<Sha256>, pss::Signature, _>(
signer_info_builder_3,
&signer_3,
&mut OsRng.unwrap_err(),
&mut SysRng.unwrap_err(),
)
.expect("error adding PKCS1v15 RSA signer info")
.build()
Expand All @@ -183,7 +183,7 @@ fn test_build_signed_data() {
#[test]
fn test_build_enveloped_data() {
let recipient_identifier = recipient_identifier(1);
let mut rng = OsRng.unwrap_err();
let mut rng = SysRng.unwrap_err();
let bits = 2048;
let recipient_private_key =
RsaPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
Expand All @@ -195,7 +195,7 @@ fn test_build_enveloped_data() {
)
.expect("Could not create a KeyTransRecipientInfoBuilder");

let mut rng = OsRng.unwrap_err();
let mut rng = SysRng.unwrap_err();
let mut builder = EnvelopedDataBuilder::new(
None,
"Arbitrary unencrypted content".as_bytes(),
Expand Down Expand Up @@ -657,7 +657,7 @@ async fn async_builder() {
.add_signer_info_with_rng_async::<pss::SigningKey<Sha256>, pss::Signature, _>(
signer_info_builder_3,
&signer_3,
&mut OsRng.unwrap_err(),
&mut SysRng.unwrap_err(),
)
.await
.expect("error adding PKCS1v15 RSA signer info")
Expand Down Expand Up @@ -897,7 +897,7 @@ fn test_create_password_recipient_info() {
content_encryption_key
}

let mut the_one_and_only_rng = OsRng.unwrap_err();
let mut the_one_and_only_rng = SysRng.unwrap_err();

// Encrypt the content-encryption key (CEK) using custom encryptor
// of type `Aes128CbcPwriEncryptor`:
Expand Down
4 changes: 2 additions & 2 deletions cms/tests/builder/kari.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use cms::{
use der::{Any, AnyRef, Encode};
use p256::{SecretKey, pkcs8::DecodePrivateKey};
use pem_rfc7468::LineEnding;
use rand::{TryRngCore, rngs::OsRng};
use rand::{TryRngCore, rngs::SysRng};
use x509_cert::serial_number::SerialNumber;

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

// Enveloped data builder
let mut rng = OsRng.unwrap_err();
let mut rng = SysRng.unwrap_err();
let mut builder = EnvelopedDataBuilder::new(
None,
"Arbitrary unencrypted content, encrypted using ECC".as_bytes(),
Expand Down
4 changes: 2 additions & 2 deletions x509-cert/tests/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use der::{
pem::LineEnding,
};
use p256::{NistP256, ecdsa::DerSignature, pkcs8::DecodePrivateKey};
use rand::rngs::OsRng;
use rand::rngs::SysRng;
use rsa::pkcs1::DecodeRsaPrivateKey;
use rsa::pkcs1v15::SigningKey;
use sha2::Sha256;
Expand Down Expand Up @@ -316,7 +316,7 @@ fn dynamic_signer() {
let csr_builder = RequestBuilder::new(subject).expect("construct builder");

let csr = if true {
let req_signer = p256::ecdsa::SigningKey::try_from_rng(&mut OsRng).unwrap();
let req_signer = p256::ecdsa::SigningKey::try_from_rng(&mut SysRng).unwrap();
csr_builder
.build::<_, p256::ecdsa::DerSignature>(&req_signer)
.expect("Sign request")
Expand Down