fixup! Always set IV length for ciphers that use an IV

sfackler · May 31, 2024 · 20ce889 · 20ce889
1 parent 551fd25
commit 20ce889
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/openssl/src/symm.rs b/openssl/src/symm.rs
@@ -626,8 +626,15 @@ impl Crypter {
 
         ctx.set_key_length(key.len())?;
 
-        if let (Some(iv), Some(_iv_len)) = (iv, t.iv_len()) {
-            ctx.set_iv_length(iv.len())?;
+        if let (Some(iv), Some(iv_len)) = (iv, t.iv_len()) {
+            if iv.len() != iv_len
+                || matches!(
+                    t.nid(),
+                    Nid::AES_128_CCM | Nid::AES_192_CCM | Nid::AES_256_CCM
+                )
+            {
+                ctx.set_iv_length(iv.len())?;
+            }
         }
 
         f(&mut ctx, None, Some(key), iv)?;