Remove old RSA sign and verify methods

2 files changed, 1 insertions, 87 deletions

diff --git a/openssl/src/crypto/rsa.rs b/openssl/src/crypto/rsa.rs
index f91f39fb..eebb9622 100644
--- a/openssl/src/crypto/rsa.rs
+++ b/openssl/src/crypto/rsa.rs
@@ -7,8 +7,6 @@ use libc::{c_int, c_void, c_char};
 use bn::{BigNum, BigNumRef};
 use bio::{MemBio, MemBioSlice};
 use error::ErrorStack;
-use HashTypeInternals;
-use crypto::hash;
 use crypto::util::{CallbackState, invoke_passwd_cb};
 
 /// Type of encryption padding to use.
@@ -248,36 +246,6 @@ impl RSA {
         }
     }
 
-     pub fn sign(&self, hash: hash::Type, message: &[u8]) -> Result<Vec<u8>, ErrorStack> {
-        assert!(self.d().is_some(), "private components missing");
-        let k_len = self.size().expect("RSA missing an n");
-        let mut sig = vec![0; k_len as usize];
-        let mut sig_len = k_len;
-
-        unsafe {
-            try_ssl!(ffi::RSA_sign(hash.as_nid() as c_int,
-                                   message.as_ptr(),
-                                   message.len() as u32,
-                                   sig.as_mut_ptr(),
-                                   &mut sig_len,
-                                   self.0));
-            assert!(sig_len == k_len);
-            Ok(sig)
-        }
-    }
-
-    pub fn verify(&self, hash: hash::Type, message: &[u8], sig: &[u8]) -> Result<(), ErrorStack> {
-        unsafe {
-            try_ssl!(ffi::RSA_verify(hash.as_nid() as c_int,
-                                     message.as_ptr(),
-                                     message.len() as u32,
-                                     sig.as_ptr(),
-                                     sig.len() as u32,
-                                     self.0));
-        }
-        Ok(())
-    }
-
     pub fn as_ptr(&self) -> *mut ffi::RSA {
         self.0
     }
@@ -429,63 +397,9 @@ mod compat {
 
 #[cfg(test)]
 mod test {
-    use std::io::Write;
     use libc::c_char;
 
     use super::*;
-    use crypto::hash::*;
-
-    fn signing_input_rs256() -> Vec<u8> {
-        vec![101, 121, 74, 104, 98, 71, 99, 105, 79, 105, 74, 83, 85, 122, 73, 49, 78, 105, 74, 57,
-             46, 101, 121, 74, 112, 99, 51, 77, 105, 79, 105, 74, 113, 98, 50, 85, 105, 76, 65, 48,
-             75, 73, 67, 74, 108, 101, 72, 65, 105, 79, 106, 69, 122, 77, 68, 65, 52, 77, 84, 107,
-             122, 79, 68, 65, 115, 68, 81, 111, 103, 73, 109, 104, 48, 100, 72, 65, 54, 76, 121,
-             57, 108, 101, 71, 70, 116, 99, 71, 120, 108, 76, 109, 78, 118, 98, 83, 57, 112, 99,
-             49, 57, 121, 98, 50, 57, 48, 73, 106, 112, 48, 99, 110, 86, 108, 102, 81]
-    }
-
-    fn signature_rs256() -> Vec<u8> {
-        vec![112, 46, 33, 137, 67, 232, 143, 209, 30, 181, 216, 45, 191, 120, 69, 243, 65, 6, 174,
-             27, 129, 255, 247, 115, 17, 22, 173, 209, 113, 125, 131, 101, 109, 66, 10, 253, 60,
-             150, 238, 221, 115, 162, 102, 62, 81, 102, 104, 123, 0, 11, 135, 34, 110, 1, 135, 237,
-             16, 115, 249, 69, 229, 130, 173, 252, 239, 22, 216, 90, 121, 142, 232, 198, 109, 219,
-             61, 184, 151, 91, 23, 208, 148, 2, 190, 237, 213, 217, 217, 112, 7, 16, 141, 178, 129,
-             96, 213, 248, 4, 12, 167, 68, 87, 98, 184, 31, 190, 127, 249, 217, 46, 10, 231, 111,
-             36, 242, 91, 51, 187, 230, 244, 74, 230, 30, 177, 4, 10, 203, 32, 4, 77, 62, 249, 18,
-             142, 212, 1, 48, 121, 91, 212, 189, 59, 65, 238, 202, 208, 102, 171, 101, 25, 129,
-             253, 228, 141, 247, 127, 55, 45, 195, 139, 159, 175, 221, 59, 239, 177, 139, 93, 163,
-             204, 60, 46, 176, 47, 158, 58, 65, 214, 18, 202, 173, 21, 145, 18, 115, 160, 95, 35,
-             185, 232, 56, 250, 175, 132, 157, 105, 132, 41, 239, 90, 30, 136, 121, 130, 54, 195,
-             212, 14, 96, 69, 34, 165, 68, 200, 242, 122, 122, 45, 184, 6, 99, 209, 108, 247, 202,
-             234, 86, 222, 64, 92, 178, 33, 90, 69, 178, 194, 85, 102, 181, 90, 193, 167, 72, 160,
-             112, 223, 200, 163, 42, 70, 149, 67, 208, 25, 238, 251, 71]
-    }
-
-    #[test]
-    pub fn test_sign() {
-        let key = include_bytes!("../../test/rsa.pem");
-        let private_key = RSA::private_key_from_pem(key).unwrap();
-
-        let mut sha = Hasher::new(Type::SHA256).unwrap();
-        sha.write_all(&signing_input_rs256()).unwrap();
-        let digest = sha.finish().unwrap();
-
-        let result = private_key.sign(Type::SHA256, &digest).unwrap();
-
-        assert_eq!(result, signature_rs256());
-    }
-
-    #[test]
-    pub fn test_verify() {
-        let key = include_bytes!("../../test/rsa.pem.pub");
-        let public_key = RSA::public_key_from_pem(key).unwrap();
-
-        let mut sha = Hasher::new(Type::SHA256).unwrap();
-        sha.write_all(&signing_input_rs256()).unwrap();
-        let digest = sha.finish().unwrap();
-
-        assert!(public_key.verify(Type::SHA256, &digest, &signature_rs256()).is_ok());
-    }
 
     #[test]
     pub fn test_password() {
diff --git a/openssl/src/crypto/sign.rs b/openssl/src/crypto/sign.rs
index f16b9b23..01dcbafc 100644
--- a/openssl/src/crypto/sign.rs
+++ b/openssl/src/crypto/sign.rs
@@ -194,7 +194,7 @@ mod test {
 
         let mut verifier = Verifier::new(Type::SHA256, &pkey).unwrap();
         verifier.update(INPUT).unwrap();
-        verifier.update(b"foobar");
+        verifier.update(b"foobar").unwrap();
         assert!(verifier.finish(SIGNATURE).is_err());
     }
 }