diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-05-15 15:51:44 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-05-20 08:41:52 +0200 |
| commit | 36a9e0a0dcb33c0cab6fdfcc6847e04b1b786a73 (patch) | |
| tree | 670d317442a0953e8df19d0caab84003bafdc018 /lib/crypto/src | |
| parent | 7e47d5082b573e3fc535b0252662813647770e66 (diff) | |
| download | otp-36a9e0a0dcb33c0cab6fdfcc6847e04b1b786a73.tar.gz otp-36a9e0a0dcb33c0cab6fdfcc6847e04b1b786a73.tar.bz2 otp-36a9e0a0dcb33c0cab6fdfcc6847e04b1b786a73.zip | |
ssl, public_key, crypto: crypto:algorithms/0 -> crypto:supports/0
Diffstat (limited to 'lib/crypto/src')
| -rw-r--r-- | lib/crypto/src/crypto.erl | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index dde53b1217..8c61084f3e 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -21,7 +21,7 @@ -module(crypto). --export([start/0, stop/0, info_lib/0, algorithms/0, version/0, binary_to_integer/1]). +-export([start/0, stop/0, info_lib/0, supports/0, version/0, binary_to_integer/1]). -export([hash/2, hash_init/1, hash_update/2, hash_final/1]). -export([sign/4, verify/5]). -export([generate_key/2, generate_key/3, compute_key/4]). @@ -218,7 +218,7 @@ des_cbc_ivec, des_cfb_ivec, info, %% - info_lib, algorithms]). + info_lib, supports]). -type mpint() :: binary(). -type rsa_digest_type() :: 'md5' | 'sha' | 'sha224' | 'sha256' | 'sha384' | 'sha512'. @@ -306,6 +306,22 @@ info_lib() -> ?nif_stub. algorithms() -> ?nif_stub. +supports()-> + Algs = algorithms(), + PubKeyAlgs = + case lists:member(ec, Algs) of + true -> + {public_keys, [rsa, dss, ecdsa, dh, ecdh]}; + false -> + {public_keys, [rsa, dss, dh]} + end, + [{hashs, Algs -- [ec]}, + {ciphers, [des_cbc, des_cfb, des3_cbc, des3_cbf, des_ede3, blowfish_cbc, + blowfish_cfb64, aes_cbc128, aes_cfb128, aes_cbc256, rc2_cbc, aes_ctr, rc4 + ]}, + PubKeyAlgs + ]. + %% Crypto app version history: %% (no version): Driver implementation %% 2.0 : NIF implementation, requires OTP R14 @@ -756,10 +772,12 @@ block_decrypt(des_ecb, Key, Data) -> block_decrypt(blowfish_ecb, Key, Data) -> blowfish_ecb_decrypt(Key, Data). --spec next_iv(des_cbc | aes_cbc, Data::iodata()) -> binary(). +-spec next_iv(des_cbc | des3_cbc | aes_cbc, Data::iodata()) -> binary(). next_iv(des_cbc, Data) -> des_cbc_ivec(Data); +next_iv(des3_cbc, Data) -> + des_cbc_ivec(Data); next_iv(aes_cbc, Data) -> aes_cbc_ivec(Data). |