aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-01-18 11:35:44 +0100
committerHans Nilsson <[email protected]>2017-01-18 11:35:44 +0100
commit57b36c454c2deed62bd62ba0eee849605774d372 (patch)
tree4e866114c32d925241435aa5aeb85a737408e9c5
parente528e53cc7bb35896d3404bb5cec5619fd21cc10 (diff)
parent1d947e619d805c76d0c9d5e1745af08da8d6cef4 (diff)
downloadotp-57b36c454c2deed62bd62ba0eee849605774d372.tar.gz
otp-57b36c454c2deed62bd62ba0eee849605774d372.tar.bz2
otp-57b36c454c2deed62bd62ba0eee849605774d372.zip
Merge branch 'maint'
-rw-r--r--lib/crypto/src/crypto.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 0b62964efa..9767a13dfc 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -159,10 +159,11 @@ cmac(Type, Key, Data, MacSize) ->
des3_cbc | des3_cbf | des3_cfb | des_ede3 |
blowfish_cbc | blowfish_cfb64 | blowfish_ofb64 |
aes_cbc128 | aes_cfb8 | aes_cfb128 | aes_cbc256 | aes_ige256 |
- aes_cbc |
+ aes_cbc |
rc2_cbc,
- Key::iodata(), Ivec::binary(), Data::iodata()) -> binary();
- (aes_gcm | chacha20_poly1305, Key::iodata(), Ivec::binary(), {AAD::binary(), Data::iodata()}) -> {binary(), binary()}.
+ Key::iodata(), Ivec::binary(), Data::iodata()) -> binary();
+ (aes_gcm | chacha20_poly1305, Key::iodata(), Ivec::binary(), {AAD::binary(), Data::iodata()}) -> {binary(), binary()};
+ (aes_gcm, Key::iodata(), Ivec::binary(), {AAD::binary(), Data::iodata(), TagLength::1..16}) -> {binary(), binary()}.
block_encrypt(Type, Key, Ivec, Data) when Type =:= des_cbc;
Type =:= des_cfb;