aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/src/crypto.erl
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-11-27 18:05:52 +0100
committerSverker Eriksson <[email protected]>2013-11-27 18:05:52 +0100
commitc95c2078a88d120f17dbd3120ac9036746fd3a41 (patch)
tree21f7b78c5c93327604565756b786e41fb698c1ab /lib/crypto/src/crypto.erl
parent998d043865059dcf7f5055a62586cc1420c221b9 (diff)
downloadotp-c95c2078a88d120f17dbd3120ac9036746fd3a41.tar.gz
otp-c95c2078a88d120f17dbd3120ac9036746fd3a41.tar.bz2
otp-c95c2078a88d120f17dbd3120ac9036746fd3a41.zip
crypto: Update supports/0 for des3_cbf and aes_ige256
Diffstat (limited to 'lib/crypto/src/crypto.erl')
-rw-r--r--lib/crypto/src/crypto.erl19
1 files changed, 6 insertions, 13 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 41fe968558..b4962fc488 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -204,20 +204,13 @@ stop() ->
application:stop(crypto).
supports()->
- Algs = algorithms(),
- PubKeyAlgs =
- case lists:member(ec, Algs) of
- true ->
- {public_keys, [rsa, dss, ecdsa, dh, srp, ecdh]};
- false ->
- {public_keys, [rsa, dss, dh, srp]}
- end,
- [{hashs, Algs -- [ec]},
- {ciphers, [des_cbc, des_cfb, des3_cbc, des3_cbf, des_ede3, blowfish_cbc,
+ {Hashs, PubKeys, Ciphers} = algorithms(),
+
+ [{hashs, Hashs},
+ {ciphers, [des_cbc, des_cfb, des3_cbc, des_ede3, blowfish_cbc,
blowfish_cfb64, blowfish_ofb64, blowfish_ecb, aes_cbc128, aes_cfb128,
- aes_cbc256, aes_ige256, rc2_cbc, aes_ctr, rc4
- ]},
- PubKeyAlgs
+ aes_cbc256, rc2_cbc, aes_ctr, rc4] ++ Ciphers},
+ {public_keys, [rsa, dss, dh, srp] ++ PubKeys}
].
info_lib() -> ?nif_stub.