diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-04-04 16:25:39 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-04-04 16:25:39 +0200 |
| commit | c04e4cd533d9a4185eadda3141e0783b0f5a0fae (patch) | |
| tree | fe4796bf3371069132cf591b7524ba48adf6a4cf /lib/crypto/src/crypto.erl | |
| parent | 38cd77b3e7afbf3973167c5a339381707e3d95bc (diff) | |
| parent | d25ad84195ca42969fbfb017a52aab8c8effc246 (diff) | |
| download | otp-c04e4cd533d9a4185eadda3141e0783b0f5a0fae.tar.gz otp-c04e4cd533d9a4185eadda3141e0783b0f5a0fae.tar.bz2 otp-c04e4cd533d9a4185eadda3141e0783b0f5a0fae.zip | |
Merge branch 'maint-19' into maint
Diffstat (limited to 'lib/crypto/src/crypto.erl')
| -rw-r--r-- | lib/crypto/src/crypto.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index 696929ba4e..60e0affda0 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -822,6 +822,8 @@ sha_mac_96(Key, Data) -> hmac(sha, Key, Data, 12). block_crypt_nif(_Type, _Key, _Ivec, _Text, _IsEncrypt) -> ?nif_stub. block_crypt_nif(_Type, _Key, _Text, _IsEncrypt) -> ?nif_stub. +aes_cfb_128_crypt_nif(_Key, _Ivec, _Text, _IsEncrypt) -> ?nif_stub. + check_des3_key(Key) -> case lists:map(fun erlang:iolist_to_binary/1, Key) of ValidKey = [B1, B2, B3] when byte_size(B1) =:= 8, @@ -915,7 +917,9 @@ blowfish_ofb64_encrypt(Key, IVec, Data) -> -spec aes_cfb_128_decrypt(iodata(), binary(), iodata()) -> binary(). aes_cfb_128_encrypt(Key, IVec, Data) -> - block_encrypt(aes_cfb128, Key, IVec, Data). + %% block_encrypt(aes_cfb128, Key, IVec, Data). + aes_cfb_128_crypt_nif(Key, IVec, Data, true). + aes_cfb_128_decrypt(Key, IVec, Data) -> block_decrypt(aes_cfb128, Key, IVec, Data). |