Commit 75152726 authored by Steven Fackler's avatar Steven Fackler
Browse files

Fix RSA::verify 

It never returns -1 - all errors are indicated by 0
parent 6091c674

openssl/src/crypto/rsa.rs

+14 −17
Original line number Diff line number Diff line
@@ -154,17 +154,16 @@ impl RSA { 
        }

    }



    pub fn verify(&self, hash: hash::Type, message: &[u8], sig: &[u8]) -> Result<bool, ErrorStack> {

    pub fn verify(&self, hash: hash::Type, message: &[u8], sig: &[u8]) -> Result<(), ErrorStack> {

        unsafe {

            let result = ffi::RSA_verify(hash.as_nid() as c_int,

            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);

            try_ssl_if!(result == -1);

            Ok(result == 1)

                                     self.0));

        }

        Ok(())

    }



    pub fn as_ptr(&self) -> *mut ffi::RSA {
@@ -280,9 +279,7 @@ mod test { 
        sha.write_all(&signing_input_rs256()).unwrap();

        let digest = sha.finish().unwrap();



        let result = public_key.verify(Type::SHA256, &digest, &signature_rs256()).unwrap();



        assert!(result);

        assert!(public_key.verify(Type::SHA256, &digest, &signature_rs256()).is_ok());

    }



    #[test]