aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-06-05 17:37:41 +0200
committerHans Nilsson <[email protected]>2018-06-11 11:00:07 +0200
commitaf11bc83244f67b9ed1fe1b75d951daadc370219 (patch)
treebe98dd0a17cde40924f6864329165d4390c739ed /lib
parentfc7ae23305a2de8ebb27e0ce723c4b3a71c9d4fc (diff)
downloadotp-af11bc83244f67b9ed1fe1b75d951daadc370219.tar.gz
otp-af11bc83244f67b9ed1fe1b75d951daadc370219.tar.bz2
otp-af11bc83244f67b9ed1fe1b75d951daadc370219.zip
crypto: Make 'curve' entry in crypto:supports() appear iff Curves is non-empty
Diffstat (limited to 'lib')
-rw-r--r--lib/crypto/src/crypto.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 6cff8a487a..37c3e557a4 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -112,8 +112,13 @@ supports()->
[{hashs, Hashs},
{ciphers, Ciphers},
{public_keys, PubKeys},
- {macs, Macs},
- {curves, Curves}
+ {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
].
info_lib() -> ?nif_stub.