Revert changes in key and hash

Modify oaep methods signatures

Author: lucdew

Cargo.toml

@@ -21,9 +21,6 @@ rand = "0.6.5"
 byteorder = "1.3.1"
 failure = "0.1.5"
 subtle = "2.0.0"
-sha-1 = "0.8.1"
-sha2 = "0.8.0"
-sha3 = "0.8.1"
 digest = "0.8.0"
 
 [dependencies.zeroize]
@@ -40,6 +37,9 @@ features = ["std", "derive"]
 base64 = "0.10.1"
 hex = "0.3.2"
 serde_test = "1.0.89"
+sha-1 = "0.8.1"
+sha2 = "0.8.0"
+sha3 = "0.8.1"
 
 
 [[bench]]

src/hash.rs

@@ -1,7 +1,3 @@
-use sha1::{Digest, Sha1};
-use sha2::{Sha224, Sha256, Sha384, Sha512};
-use sha3::{Sha3_256, Sha3_384, Sha3_512};
-
 /// A generic trait that exposes the information that is needed for a hash function to be
 /// used in `sign` and `verify.`.
 pub trait Hash {
@@ -11,7 +7,6 @@ pub trait Hash {
     /// Returns the ASN1 DER prefix for the the hash function.
     fn asn1_prefix(&self) -> Vec<u8>;
 
-    fn digest(&self, msg: &[u8]) -> Vec<u8>;
 }
 
 /// A list of provided hashes, implementing `Hash`.
@@ -30,12 +25,6 @@ pub enum Hashes {
     RIPEMD160,
 }
 
-fn digest<H: Digest>(msg: &[u8], hasher: &mut H) -> Vec<u8> {
-    hasher.input(msg);
-    let res = hasher.result_reset();
-    res.iter().cloned().collect()
-}
-
 impl Hash for Hashes {
     fn size(&self) -> usize {
         match *self {
@@ -102,20 +91,4 @@ impl Hash for Hashes {
             ],
         }
     }
-
-    fn digest(&self, msg: &[u8]) -> Vec<u8> {
-        match *self {
-            Hashes::MD5 => panic!("Not implemented"),
-            Hashes::SHA1 => digest(msg, &mut Sha1::new()),
-            Hashes::SHA2_224 => digest(msg, &mut Sha224::new()),
-            Hashes::SHA2_256 => digest(msg, &mut Sha256::new()),
-            Hashes::SHA2_384 => digest(msg, &mut Sha384::new()),
-            Hashes::SHA2_512 => digest(msg, &mut Sha512::new()),
-            Hashes::SHA3_256 => digest(msg, &mut Sha3_256::new()),
-            Hashes::SHA3_384 => digest(msg, &mut Sha3_384::new()),
-            Hashes::SHA3_512 => digest(msg, &mut Sha3_512::new()),
-            Hashes::MD5SHA1 => panic!("Not implemented"),
-            Hashes::RIPEMD160 => panic!("Not implemented"),
-        }
-    }
 }

src/key.rs

@@ -10,7 +10,6 @@ use zeroize::{Zeroize, ZeroizeOnDrop};
 use crate::algorithms::generate_multi_prime_key;
 use crate::errors::{Error, Result};
 use crate::hash::Hash;
-use crate::oaep;
 use crate::padding::PaddingScheme;
 use crate::pkcs1v15;
 
@@ -153,7 +152,7 @@ impl PublicKey for RSAPublicKey {
     fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
         match padding {
             PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
-            PaddingScheme::OAEP => oaep::encrypt(rng, self, msg, oaep::OaepOptions::new()),
+            PaddingScheme::OAEP => unimplemented!("not yet implemented"),
             _ => Err(Error::InvalidPaddingScheme),
         }
     }
@@ -219,7 +218,7 @@ impl PublicKey for RSAPrivateKey {
     fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
         match padding {
             PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
-            PaddingScheme::OAEP => oaep::encrypt(rng, self, msg, oaep::OaepOptions::new()),
+            PaddingScheme::OAEP => unimplemented!("not yet implemented"),
             _ => Err(Error::InvalidPaddingScheme),
         }
     }
@@ -393,9 +392,7 @@ impl RSAPrivateKey {
         match padding {
             // need to pass any Rng as the type arg, so the type checker is happy, it is not actually used for anything
             PaddingScheme::PKCS1v15 => pkcs1v15::decrypt::<ThreadRng>(None, self, ciphertext),
-            PaddingScheme::OAEP => {
-                oaep::decrypt::<ThreadRng>(None, self, ciphertext, oaep::OaepOptions::new())
-            }
+            PaddingScheme::OAEP => unimplemented!("not yet implemented"),
             _ => Err(Error::InvalidPaddingScheme),
         }
     }
@@ -410,9 +407,7 @@ impl RSAPrivateKey {
     ) -> Result<Vec<u8>> {
         match padding {
             PaddingScheme::PKCS1v15 => pkcs1v15::decrypt(Some(rng), self, ciphertext),
-            PaddingScheme::OAEP => {
-                oaep::decrypt(Some(rng), self, ciphertext, oaep::OaepOptions::new())
-            }
+            PaddingScheme::OAEP => unimplemented!("not yet implemented"),
             _ => Err(Error::InvalidPaddingScheme),
         }
     }

src/lib.rs

@@ -46,10 +46,6 @@ extern crate hex;
 #[cfg(all(test, feature = "serde1"))]
 extern crate serde_test;
 
-extern crate digest;
-extern crate sha1;
-extern crate sha2;
-extern crate sha3;
 
 /// Useful algorithms.
 pub mod algorithms;