diff options
| author | Hans Nilsson <[email protected]> | 2018-08-17 10:08:20 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-08-17 10:08:20 +0200 |
| commit | 1e02ec72cd03275da5639aea77d1a2ec5832a042 (patch) | |
| tree | 0c95262eca00f999ad84d3df31e217670a111525 /lib/crypto/src/crypto.erl | |
| parent | 0fac9bf23a138a41d29535ff027bd258b9575d27 (diff) | |
| parent | cc674152dca738da434872f78a85f6cf7070d29b (diff) | |
| download | otp-1e02ec72cd03275da5639aea77d1a2ec5832a042.tar.gz otp-1e02ec72cd03275da5639aea77d1a2ec5832a042.tar.bz2 otp-1e02ec72cd03275da5639aea77d1a2ec5832a042.zip | |
Merge branch 'hans/crypto/curve_in_supports/OTP-14717' into maint
* hans/crypto/curve_in_supports/OTP-14717:
crypto: Try to generate ecdh for all crypto:curves()
crypto: Put curve list in C
Diffstat (limited to 'lib/crypto/src/crypto.erl')
| -rw-r--r-- | lib/crypto/src/crypto.erl | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index 714cba58b9..835cadce47 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -108,17 +108,11 @@ stop() -> supports()-> {Hashs, PubKeys, Ciphers, Macs, Curves} = algorithms(), - [{hashs, Hashs}, {ciphers, Ciphers}, {public_keys, PubKeys}, - {macs, Macs} - | case Curves of - [] -> []; - _ -> [{curves, Curves}] % Only show this experimental feature - % if OpenSSL 1.1.1 beta4 or higher (where - % eddsa and eddh is enabled) - end + {macs, Macs}, + {curves, Curves} ]. info_lib() -> ?nif_stub. |