aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/src/crypto.erl
diff options
context:
space:
mode:
authorLeo Liu <[email protected]>2017-01-17 09:06:25 +0800
committerLeo Liu <[email protected]>2017-01-17 09:24:05 +0800
commit6d2eb58ee86e3fe36e61f00dbe443ee8d49c421f (patch)
tree1e24f93e79522bcaa02747b6ce0a965a4b098355 /lib/crypto/src/crypto.erl
parent228e34eb3eb75dd0cac1c7137861ee4a7b5b3f69 (diff)
downloadotp-6d2eb58ee86e3fe36e61f00dbe443ee8d49c421f.tar.gz
otp-6d2eb58ee86e3fe36e61f00dbe443ee8d49c421f.tar.bz2
otp-6d2eb58ee86e3fe36e61f00dbe443ee8d49c421f.zip
Add a missing aes_gcm -spec clause to crypto:block_encrypt/4
Fix https://bugs.erlang.org/browse/ERL-336.
Diffstat (limited to 'lib/crypto/src/crypto.erl')
-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 da8626e38a..a87b480f60 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -277,10 +277,11 @@ hmac_final_n(Context, HashLen) ->
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;