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

Avoid duplicate calls to *_Final when dropping Hasher and HMAC 

An assertion triggered in finalize() would lead to drop() erroneously redoing the finalization. Set the state to Finalized unconditionally to prevent this.
This commit is contained in:
Gleb Kozyrev 2015-01-29 17:50:10 +02:00
parent 8b47daae66
commit 4bd7ed8a39
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/crypto/hash.rs
View File

@ -153,10 +153,10 @@ impl Hasher {
unsafe { unsafe {
let mut len = 0; let mut len = 0;
let r = ffi::EVP_DigestFinal_ex(self.ctx, res.as_mut_ptr(), &mut len); let r = ffi::EVP_DigestFinal_ex(self.ctx, res.as_mut_ptr(), &mut len);
self.state = Finalized;
assert_eq!(len as usize, md_len); assert_eq!(len as usize, md_len);
assert_eq!(r, 1); assert_eq!(r, 1);
} }
self.state = Finalized;
res res
} }

2
src/crypto/hmac.rs
View File

@ -136,10 +136,10 @@ impl HMAC {
unsafe { unsafe {
let mut len = 0; let mut len = 0;
let r = ffi::HMAC_Final(&mut self.ctx, res.as_mut_ptr(), &mut len); let r = ffi::HMAC_Final(&mut self.ctx, res.as_mut_ptr(), &mut len);
self.state = Finalized;
assert_eq!(len as usize, md_len); assert_eq!(len as usize, md_len);
assert_eq!(r, 1); assert_eq!(r, 1);
} }
self.state = Finalized;
res res
} }