Bump rand_core to v0.10.0-rc-6

Renames `(Try)RngCore` => `(Try)Rng`

Author: tarcieri

Cargo.lock

@@ -25,3 +25,11 @@ lms-signature = { path = "./lms" }
 ml-dsa = { path = "./ml-dsa" }
 rfc6979 = { path = "./rfc6979" }
 slh-dsa = { path = "./slh-dsa" }
+
+[patch.crates-io.crypto-primes]
+git = "https://github.com/tarcieri/crypto-primes"
+branch = "crypto-bigint/v0.7.0-rc.22"
+
+[patch.crates-io.rand]
+git = "https://github.com/rust-random/rand"
+branch = "rand_core/v0.10.0-rc-6"

Cargo.toml

@@ -29,15 +29,15 @@ zeroize = { version = "1", default-features = false, features = ["alloc"] }
 pkcs8 = { version = "0.11.0-rc.8", optional = true, default-features = false, features = ["alloc"] }
 
 [dev-dependencies]
-chacha20 = { version = "0.10.0-rc.7", features = ["rng"] }
+chacha20 = { version = "0.10.0-rc.9", features = ["rng"] }
 hex = "0.4"
 hex-literal = "1"
 pkcs8 = { version = "0.11.0-rc.8", default-features = false, features = ["pem"] }
 proptest = "1"
 getrandom = { version = "0.4.0-rc.0", features = ["sys_rng"] }
 sha1 = "0.11.0-rc.2"
 der = { version = "0.8.0-rc.10", features = ["derive"] }
-rand_core = "0.10.0-rc-5"
+rand_core = "0.10.0-rc-6"
 
 [features]
 default = ["pkcs8"]

dsa/Cargo.toml

@@ -1,12 +1,12 @@
 #![cfg(feature = "hazmat")]
 
 use dsa::{Components, KeySize, SigningKey};
-use getrandom::rand_core::TryRngCore;
+use getrandom::SysRng;
 use pkcs8::{EncodePrivateKey, EncodePublicKey, LineEnding};
 use std::{fs::File, io::Write};
 
 fn main() {
-    let mut rng = getrandom::SysRng.unwrap_err();
+    let mut rng = rand_core::UnwrapErr(SysRng);
     let components = Components::generate(&mut rng, KeySize::DSA_2048_256);
     let signing_key = SigningKey::generate(&mut rng, components);
     let verifying_key = signing_key.verifying_key();

dsa/examples/export.rs

@@ -1,10 +1,10 @@
 #![cfg(feature = "hazmat")]
 
 use dsa::{Components, KeySize, SigningKey};
-use getrandom::rand_core::TryRngCore;
+use getrandom::{SysRng, rand_core::UnwrapErr};
 
 fn main() {
-    let mut rng = getrandom::SysRng.unwrap_err();
+    let mut rng = UnwrapErr(SysRng);
     let components = Components::generate(&mut rng, KeySize::DSA_2048_256);
     let signing_key = SigningKey::generate(&mut rng, components);
     let _verifying_key = signing_key.verifying_key();

dsa/examples/generate.rs

@@ -1,13 +1,13 @@
 use digest::Digest;
 use dsa::{Components, KeySize, SigningKey};
-use getrandom::rand_core::TryRngCore;
+use getrandom::{SysRng, rand_core::UnwrapErr};
 use pkcs8::{EncodePrivateKey, EncodePublicKey, LineEnding};
 use sha1::Sha1;
 use signature::{RandomizedDigestSigner, SignatureEncoding};
 use std::{fs::File, io::Write};
 
 fn main() {
-    let mut rng = getrandom::SysRng.unwrap_err();
+    let mut rng = UnwrapErr(SysRng);
     let components = Components::generate(&mut rng, KeySize::DSA_2048_256);
     let signing_key = SigningKey::generate(&mut rng, components);
     let verifying_key = signing_key.verifying_key();

dsa/examples/sign.rs

@@ -15,9 +15,9 @@
 #![cfg_attr(feature = "hazmat", doc = "```")]
 #![cfg_attr(not(feature = "hazmat"), doc = "```ignore")]
 //! # use dsa::{KeySize, Components, SigningKey};
-//! use getrandom::rand_core::TryRngCore;
+//! use getrandom::{SysRng, rand_core::UnwrapErr};
 //!
-//! let mut csprng = getrandom::SysRng.unwrap_err();
+//! let mut csprng = UnwrapErr(SysRng);
 //! let components = Components::generate(&mut csprng, KeySize::DSA_2048_256);
 //! let signing_key = SigningKey::generate(&mut csprng, components);
 //! let verifying_key = signing_key.verifying_key();

dsa/src/lib.rs

@@ -3,9 +3,9 @@
 
 use digest::Digest;
 use dsa::{Components, KeySize, Signature, SigningKey};
+use getrandom::{SysRng, rand_core::UnwrapErr};
 use hex_literal::hex;
 use pkcs8::der::{Decode, Encode};
-use rand_core::TryRngCore;
 use sha2::Sha256;
 use signature::{
     DigestVerifier, RandomizedDigestSigner, Signer, Verifier,
@@ -33,7 +33,7 @@ const MESSAGE_SIGNATURE_OPENSSL_ASN1: &[u8] = &hex!(
 
 /// Generate a random DSA keypair
 fn generate_random_keypair() -> SigningKey {
-    let mut rng = getrandom::SysRng.unwrap_err();
+    let mut rng = UnwrapErr(SysRng);
     let components = Components::generate(&mut rng, KeySize::DSA_1024_160);
     SigningKey::generate(&mut rng, components)
 }
@@ -60,7 +60,7 @@ fn decode_encode_signature() {
 #[test]
 fn sign_verify_message() {
     let signing_key = generate_random_keypair();
-    let mut rng = getrandom::SysRng.unwrap_err();
+    let mut rng = UnwrapErr(SysRng);
     let generated_signature =
         signing_key.sign_digest_with_rng(&mut rng, |digest: &mut Sha256| digest.update(MESSAGE));
 

dsa/tests/signature.rs

@@ -9,15 +9,15 @@ use crypto_bigint::{
 };
 use digest::Digest;
 use dsa::{Components, KeySize, SigningKey};
-use getrandom::rand_core::TryRngCore;
+use getrandom::{SysRng, rand_core::UnwrapErr};
 use pkcs8::{DecodePrivateKey, EncodePrivateKey, LineEnding};
 use sha1::Sha1;
 use signature::{DigestVerifier, RandomizedDigestSigner};
 
 const OPENSSL_PEM_PRIVATE_KEY: &str = include_str!("pems/private.pem");
 
 fn generate_keypair() -> SigningKey {
-    let mut rng = getrandom::SysRng.unwrap_err();
+    let mut rng = UnwrapErr(SysRng);
     let components = Components::generate(&mut rng, KeySize::DSA_1024_160);
     SigningKey::generate(&mut rng, components)
 }
@@ -49,7 +49,7 @@ fn sign_and_verify() {
 
     let signing_key = generate_keypair();
     let verifying_key = signing_key.verifying_key();
-    let mut rng = getrandom::SysRng.unwrap_err();
+    let mut rng = UnwrapErr(SysRng);
 
     let signature =
         signing_key.sign_digest_with_rng(&mut rng, |digest: &mut Sha1| digest.update(DATA));

dsa/tests/signing_key.rs

@@ -13,14 +13,14 @@ use {
         modular::{BoxedMontyForm, BoxedMontyParams},
     },
     dsa::{Components, KeySize, SigningKey},
-    getrandom::rand_core::TryRngCore,
+    getrandom::SysRng,
 };
 
 const OPENSSL_PEM_PUBLIC_KEY: &str = include_str!("pems/public.pem");
 
 #[cfg(feature = "hazmat")]
 fn generate_verifying_key() -> VerifyingKey {
-    let mut rng = getrandom::SysRng.unwrap_err();
+    let mut rng = rand_core::UnwrapErr(SysRng);
     let components = Components::generate(&mut rng, KeySize::DSA_1024_160);
     let signing_key = SigningKey::generate(&mut rng, components);