min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix RSA::verify 

It never returns -1 - all errors are indicated by 0
This commit is contained in:
Steven Fackler 2016-08-07 18:03:13 -07:00
parent 6091c674c9
commit 7515272692
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openssl/src/crypto/rsa.rs
View File

@ -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]