aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-09-07 13:51:46 +0200
committerHans Nilsson <[email protected]>2018-09-07 13:51:46 +0200
commit11669ff55cee51168f6bd19e17c18c81be762bd8 (patch)
treefb856dcc792d1bf06476d6e8b9397e06da6bc65a
parentd4d6ed058530e5db26782dea4a0fd62c2d1098c4 (diff)
parent5107b29a1bca592c0ea3840d263d0dd1f48e2ed3 (diff)
downloadotp-11669ff55cee51168f6bd19e17c18c81be762bd8.tar.gz
otp-11669ff55cee51168f6bd19e17c18c81be762bd8.tar.bz2
otp-11669ff55cee51168f6bd19e17c18c81be762bd8.zip
Merge branch 'hans/crypto/next_iv/OTP-15283' into maint
* hans/crypto/next_iv/OTP-15283: crypto: Bug fix - crypto:next_iv regarding aes_ige256 crypto: Bug fix - blowfish_cbc allowed in crypto:next_iv
-rw-r--r--lib/crypto/src/crypto.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index a9d933f5d7..17351d10ea 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -298,8 +298,10 @@ next_iv(Type, Data) when is_binary(Data) ->
IVecSize = case Type of
des_cbc -> 8;
des3_cbc -> 8;
+ blowfish_cbc -> 8;
aes_cbc -> 16;
- aes_ige -> 32
+ aes_ige -> 32; % For compatibility if someone has bug-adapted code
+ aes_ige256 -> 32 % The name used in block_encrypt et al
end,
{_, IVec} = split_binary(Data, size(Data) - IVecSize),
IVec;