aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-01-18 11:34:32 +0100
committerGitHub <[email protected]>2017-01-18 11:34:32 +0100
commit1d947e619d805c76d0c9d5e1745af08da8d6cef4 (patch)
treedc0e9c2987e5356b0b32963a20f720c65cd95190 /lib/crypto
parent6927f85ed386ea3c0f43bd042ea4c917103d76a2 (diff)
parent6d2eb58ee86e3fe36e61f00dbe443ee8d49c421f (diff)
downloadotp-1d947e619d805c76d0c9d5e1745af08da8d6cef4.tar.gz
otp-1d947e619d805c76d0c9d5e1745af08da8d6cef4.tar.bz2
otp-1d947e619d805c76d0c9d5e1745af08da8d6cef4.zip
Merge pull request #1311 from leoliu/fix-ERL-336
Add a missing aes_gcm -spec clause to crypto:block_encrypt/4
Diffstat (limited to 'lib/crypto')
-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;