feat: switch to version 2.0 (pre) of the signature crate

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rsa"
-version = "0.7.2"
+version = "0.8.0-pre"
 authors = ["RustCrypto Developers", "dignifiedquire <dignifiedquire@gmail.com>"]
 edition = "2021"
 description = "Pure Rust RSA implementation"
@@ -17,13 +17,13 @@ num-bigint = { version = "0.8.1", features = ["i128", "u64_digit", "prime", "zer
 num-traits = { version= "0.2.9", default-features = false, features = ["libm"] }
 num-integer = { version = "0.1.39", default-features = false }
 num-iter = { version = "0.1.37", default-features = false }
-rand_core = { version = "0.6", default-features = false }
+rand_core = { version = "0.6.4", default-features = false }
 byteorder = { version = "1.3.1", default-features = false }
 subtle = { version = "2.1.1", default-features = false }
 digest = { version = "0.10.5", default-features = false, features = ["alloc", "oid"] }
 pkcs1 = { version = "0.4", default-features = false, features = ["pkcs8", "alloc"] }
 pkcs8 = { version = "0.9", default-features = false, features = ["alloc"] }
-signature = { version = "1.6.4", default-features = false , features = ["digest-preview", "rand-preview"] }
+signature = { version = "2.0.0-pre.2", default-features = false , features = ["digest-preview", "rand-preview"] }
 zeroize = { version = "1", features = ["alloc"] }
 
 # Temporary workaround until https://github.com/dignifiedquire/num-bigint/pull/42 lands
@@ -53,7 +53,6 @@ name = "key"
 
 [features]
 default = ["std", "pem"]
-hazmat = ["signature/hazmat-preview"]
 nightly = ["num-bigint/nightly"]
 serde = ["num-bigint/serde", "serde_crate"]
 expose-internals = []

src/algorithms.rs

@@ -6,7 +6,7 @@ use num_bigint::{BigUint, RandPrime};
 #[allow(unused_imports)]
 use num_traits::Float;
 use num_traits::{FromPrimitive, One, Zero};
-use rand_core::{CryptoRng, RngCore};
+use rand_core::CryptoRngCore;
 
 use crate::errors::{Error, Result};
 use crate::key::RsaPrivateKey;
@@ -29,7 +29,7 @@ const EXP: u64 = 65537;
 ///
 /// [1]: https://patents.google.com/patent/US4405829A/en
 /// [2]: https://cacr.uwaterloo.ca/techreports/2006/cacr2006-16.pdf
-pub fn generate_multi_prime_key<R: RngCore + CryptoRng>(
+pub fn generate_multi_prime_key<R: CryptoRngCore + ?Sized>(
     rng: &mut R,
     nprimes: usize,
     bit_size: usize,
@@ -49,7 +49,7 @@ pub fn generate_multi_prime_key<R: RngCore + CryptoRng>(
 ///
 /// [1]: https://patents.google.com/patent/US4405829A/en
 /// [2]: http://www.cacr.math.uwaterloo.ca/techreports/2006/cacr2006-16.pdf
-pub fn generate_multi_prime_key_with_exp<R: RngCore + CryptoRng>(
+pub fn generate_multi_prime_key_with_exp<R: CryptoRngCore + ?Sized>(
     rng: &mut R,
     nprimes: usize,
     bit_size: usize,

src/key.rs

@@ -4,7 +4,7 @@ use num_bigint::traits::ModInverse;
 use num_bigint::Sign::Plus;
 use num_bigint::{BigInt, BigUint};
 use num_traits::{One, ToPrimitive};
-use rand_core::{CryptoRng, RngCore};
+use rand_core::CryptoRngCore;
 #[cfg(feature = "serde")]
 use serde_crate::{Deserialize, Serialize};
 use zeroize::Zeroize;
@@ -173,7 +173,7 @@ impl From<&RsaPrivateKey> for RsaPublicKey {
 /// Generic trait for operations on a public key.
 pub trait PublicKey: EncryptionPrimitive + PublicKeyParts {
     /// Encrypt the given message.
-    fn encrypt<R: RngCore + CryptoRng>(
+    fn encrypt<R: CryptoRngCore>(
         &self,
         rng: &mut R,
         padding: PaddingScheme,
@@ -198,7 +198,7 @@ impl PublicKeyParts for RsaPublicKey {
 }
 
 impl PublicKey for RsaPublicKey {
-    fn encrypt<R: RngCore + CryptoRng>(
+    fn encrypt<R: CryptoRngCore>(
         &self,
         rng: &mut R,
         padding: PaddingScheme,
@@ -281,15 +281,15 @@ impl PrivateKey for RsaPrivateKey {}
 
 impl RsaPrivateKey {
     /// Generate a new Rsa key pair of the given bit size using the passed in `rng`.
-    pub fn new<R: RngCore + CryptoRng>(rng: &mut R, bit_size: usize) -> Result<RsaPrivateKey> {
+    pub fn new<R: CryptoRngCore + ?Sized>(rng: &mut R, bit_size: usize) -> Result<RsaPrivateKey> {
         generate_multi_prime_key(rng, 2, bit_size)
     }
 
     /// Generate a new RSA key pair of the given bit size and the public exponent
     /// using the passed in `rng`.
     ///
     /// Unless you have specific needs, you should use `RsaPrivateKey::new` instead.
-    pub fn new_with_exp<R: RngCore + CryptoRng>(
+    pub fn new_with_exp<R: CryptoRngCore + ?Sized>(
         rng: &mut R,
         bit_size: usize,
         exp: &BigUint,
@@ -473,7 +473,7 @@ impl RsaPrivateKey {
     /// Decrypt the given message.
     ///
     /// Uses `rng` to blind the decryption process.
-    pub fn decrypt_blinded<R: RngCore + CryptoRng>(
+    pub fn decrypt_blinded<R: CryptoRngCore>(
         &self,
         rng: &mut R,
         padding: PaddingScheme,
@@ -516,7 +516,7 @@ impl RsaPrivateKey {
     /// Sign the given digest using the provided rng
     ///
     /// Use `rng` for signature process.
-    pub fn sign_with_rng<R: RngCore + CryptoRng>(
+    pub fn sign_with_rng<R: CryptoRngCore>(
         &self,
         rng: &mut R,
         padding: PaddingScheme,
@@ -534,7 +534,7 @@ impl RsaPrivateKey {
     /// Sign the given digest.
     ///
     /// Use `rng` for blinding.
-    pub fn sign_blinded<R: RngCore + CryptoRng>(
+    pub fn sign_blinded<R: CryptoRngCore>(
         &self,
         rng: &mut R,
         padding: PaddingScheme,

src/lib.rs

@@ -59,20 +59,20 @@
 //! ```
 //! use rsa::RsaPrivateKey;
 //! use rsa::pkcs1v15::{SigningKey, VerifyingKey};
-//! use rsa::signature::{RandomizedSigner, Signature, Verifier};
+//! use rsa::signature::{Keypair, RandomizedSigner, SignatureEncoding, Verifier};
 //! use sha2::{Digest, Sha256};
 //!
 //! let mut rng = rand::thread_rng();
 //!
 //! let bits = 2048;
 //! let private_key = RsaPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
 //! let signing_key = SigningKey::<Sha256>::new_with_prefix(private_key);
-//! let verifying_key: VerifyingKey<_> = (&signing_key).into();
+//! let verifying_key = signing_key.verifying_key();
 //!
 //! // Sign
 //! let data = b"hello world";
 //! let signature = signing_key.sign_with_rng(&mut rng, data);
-//! assert_ne!(signature.as_bytes(), data);
+//! assert_ne!(signature.to_bytes().as_ref(), data.as_slice());
 //!
 //! // Verify
 //! verifying_key.verify(data, &signature).expect("failed to verify");
@@ -82,20 +82,20 @@
 //! ```
 //! use rsa::RsaPrivateKey;
 //! use rsa::pss::{BlindedSigningKey, VerifyingKey};
-//! use rsa::signature::{RandomizedSigner, Signature, Verifier};
+//! use rsa::signature::{Keypair,RandomizedSigner, SignatureEncoding, Verifier};
 //! use sha2::{Digest, Sha256};
 //!
 //! let mut rng = rand::thread_rng();
 //!
 //! let bits = 2048;
 //! let private_key = RsaPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
 //! let signing_key = BlindedSigningKey::<Sha256>::new(private_key);
-//! let verifying_key: VerifyingKey<_> = (&signing_key).into();
+//! let verifying_key = signing_key.verifying_key();
 //!
 //! // Sign
 //! let data = b"hello world";
 //! let signature = signing_key.sign_with_rng(&mut rng, data);
-//! assert_ne!(signature.as_bytes(), data);
+//! assert_ne!(signature.to_bytes().as_ref(), data);
 //!
 //! // Verify
 //! verifying_key.verify(data, &signature).expect("failed to verify");