Fix the tests

Author: roblabla

Cargo.toml

@@ -22,9 +22,7 @@ byteorder = { version = "1.3.1", default-features = false }
 failure = { version = "0.1.5", default-features = false, features = ["derive"] }
 subtle = { version = "2.0.0", default-features = false }
 libm = "0.1.4"
-signature = { version = "0.2.0", default-features = false }
-sha2 = { version = "0.8", default-features = false }
-sha-1 = { version = "0.8.1", default-features = false }
+digest = "0.8"
 
 [dependencies.zeroize]
 version = "0.6"
@@ -40,6 +38,7 @@ features = ["derive"]
 base64 = "0.10.1"
 hex = "0.3.2"
 serde_test = "1.0.89"
+sha-1 = "0.8.1"
 
 
 [[bench]]

src/key.rs

@@ -392,8 +392,10 @@ mod tests {
     #[test]
     fn test_from_into() {
         let private_key = RSAPrivateKey {
-            n: BigUint::from_u64(100).unwrap(),
-            e: BigUint::from_u64(200).unwrap(),
+            pubkey_components: RSAPublicKey {
+                n: BigUint::from_u64(100).unwrap(),
+                e: BigUint::from_u64(200).unwrap(),
+            },
             d: BigUint::from_u64(123).unwrap(),
             primes: vec![],
             precomputed: None,

src/lib.rs

@@ -8,7 +8,7 @@
 //! extern crate rsa;
 //! extern crate rand;
 //!
-//! use rsa::{PublicKey, RSAPrivateKey, PaddingScheme};
+//! use rsa::RSAPrivateKey;
 //! use rand::rngs::OsRng;
 //!
 //! let mut rng = OsRng::new().expect("no secure randomness available");
@@ -17,11 +17,11 @@
 //!
 //! // Encrypt
 //! let data = b"hello world";
-//! let enc_data = key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
+//! let enc_data = key.encrypt_pkcs1v15(&mut rng, &data[..]).expect("failed to encrypt");
 //! assert_ne!(&data[..], &enc_data[..]);
 //!
 //! // Decrypt
-//! let dec_data = key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
+//! let dec_data = key.decrypt_pkcs1v15(&enc_data).expect("failed to decrypt");
 //! assert_eq!(&data[..], &dec_data[..]);
 //! ```
 //!
@@ -65,15 +65,11 @@ pub mod errors;
 /// Supported hash functions.
 pub mod hash;
 
-/// Supported padding schemes.
-pub mod padding;
-
 mod key;
 mod pkcs1v15;
 mod pss;
 
 pub use self::key::{RSAPrivateKey, RSAPublicKey};
-pub use self::padding::PaddingScheme;
 
 // Optionally expose internals if requested via feature-flag.
 

src/padding.rs

@@ -267,7 +267,6 @@ mod tests {
 
     use crate::hash::Hashes;
     use crate::key::RSAPublicKey;
-    use crate::padding::PaddingScheme;
 
     #[test]
     fn test_non_zero_bytes() {
@@ -324,7 +323,7 @@ mod tests {
 
         for test in &tests {
             let out = priv_key
-                .decrypt(PaddingScheme::PKCS1v15, &base64::decode(test[0]).unwrap())
+                .decrypt_pkcs1v15(&base64::decode(test[0]).unwrap())
                 .unwrap();
             assert_eq!(out, test[1].as_bytes());
         }
@@ -365,16 +364,15 @@ mod tests {
             let expected = hex::decode(test[1]).unwrap();
 
             let out = priv_key
-                .sign(PaddingScheme::PKCS1v15, Some(&Hashes::SHA1), &digest)
+                .sign_pkcs1v15(Some(&Hashes::SHA1), &digest)
                 .unwrap();
             assert_ne!(out, digest);
             assert_eq!(out, expected);
 
             let mut rng = thread_rng();
             let out2 = priv_key
-                .sign_blinded(
+                .sign_pkcs1v15_blinded(
                     &mut rng,
-                    PaddingScheme::PKCS1v15,
                     Some(&Hashes::SHA1),
                     &digest,
                 )
@@ -397,7 +395,7 @@ mod tests {
             let sig = hex::decode(test[1]).unwrap();
 
             pub_key
-                .verify(PaddingScheme::PKCS1v15, Some(&Hashes::SHA1), &digest, &sig)
+                .verify_pkcs1v15(Some(&Hashes::SHA1), &digest, &sig)
                 .expect("failed to verify");
         }
     }
@@ -409,13 +407,13 @@ mod tests {
         let priv_key = get_private_key();
 
         let sig = priv_key
-            .sign::<Hashes>(PaddingScheme::PKCS1v15, None, msg)
+            .sign_pkcs1v15::<Hashes>(None, msg)
             .unwrap();
         assert_eq!(expected_sig, sig);
 
         let pub_key: RSAPublicKey = priv_key.into();
         pub_key
-            .verify(PaddingScheme::PKCS1v15, None, msg, &sig)
+            .verify_pkcs1v15::<Hashes>(None, msg, &sig)
             .expect("failed to verify");
     }
 }