aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-09-07 13:52:09 +0200
committerHans Nilsson <[email protected]>2018-09-07 13:52:09 +0200
commitabd31c81eea2e19d967f42b09f32bb87528c83d8 (patch)
treef9d87fb8a912a9667cca7d2e848dbe4828971732 /lib/crypto
parent5be6eed2294d740ec7ca9c7818e277b261604e97 (diff)
parent11669ff55cee51168f6bd19e17c18c81be762bd8 (diff)
downloadotp-abd31c81eea2e19d967f42b09f32bb87528c83d8.tar.gz
otp-abd31c81eea2e19d967f42b09f32bb87528c83d8.tar.bz2
otp-abd31c81eea2e19d967f42b09f32bb87528c83d8.zip
Merge branch 'maint'
* maint: crypto: Bug fix - crypto:next_iv regarding aes_ige256 crypto: Bug fix - blowfish_cbc allowed in crypto:next_iv
Diffstat (limited to 'lib/crypto')
-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;