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

Merge pull request #1191 from sfackler/fix-seal 

Fix IV handling in envelope
This commit is contained in:
Steven Fackler 2019-11-21 20:09:21 -05:00 committed by GitHub
parent 56335d12fc ca5474683a
commit b5eafedf17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openssl/src/envelope.rs
View File

@ -64,7 +64,7 @@ impl Seal {
enc_key_ptrs.push(enc_key_ptr); enc_key_ptrs.push(enc_key_ptr);
pub_key_ptrs.push(key.as_ptr()); pub_key_ptrs.push(key.as_ptr());
} }
let mut iv = cipher.iv_len().map(|len| Vec::with_capacity(len)); let mut iv = cipher.iv_len().map(|len| vec![0; len]);
let iv_ptr = iv.as_mut().map_or(ptr::null_mut(), |v| v.as_mut_ptr()); let iv_ptr = iv.as_mut().map_or(ptr::null_mut(), |v| v.as_mut_ptr());
let mut enc_key_lens = vec![0; enc_keys.len()]; let mut enc_key_lens = vec![0; enc_keys.len()];
@ -176,7 +176,12 @@ impl Open {
{ {
unsafe { unsafe {
assert!(encrypted_key.len() <= c_int::max_value() as usize); assert!(encrypted_key.len() <= c_int::max_value() as usize);
assert!(cipher.iv_len().is_none() || iv.is_some()); match (cipher.iv_len(), iv) {
(Some(len), Some(iv)) => assert_eq!(len, iv.len(), "IV length mismatch"),
(None, None) => {}
(Some(_), None) => panic!("an IV was required but not provided"),
(None, Some(_)) => panic!("an IV was provided but not required"),
}
let ctx = cvt_p(ffi::EVP_CIPHER_CTX_new())?; let ctx = cvt_p(ffi::EVP_CIPHER_CTX_new())?;
cvt(ffi::EVP_OpenInit( cvt(ffi::EVP_OpenInit(