1 files changed, 1 insertions, 35 deletions
diff --git a/lib/crypto/src/crypto_ec_curves.erl b/lib/crypto/src/crypto_ec_curves.erl
index 9602a7e24b..a0a2f99601 100644
--- a/lib/crypto/src/crypto_ec_curves.erl
+++ b/lib/crypto/src/crypto_ec_curves.erl
@@ -3,41 +3,7 @@
 -export([curve/1, curves/0]).
 
 curves() ->
-    CryptoSupport = crypto:supports(),
-    PubKeys = proplists:get_value(public_keys, CryptoSupport),
-    HasEC   = proplists:get_bool(ecdh, PubKeys),
-    HasGF2m = proplists:get_bool(ec_gf2m, PubKeys),
-    FIPSMode = crypto:info_fips() == enabled,
-    prime_curves(HasEC, FIPSMode) ++ characteristic_two_curves(HasGF2m, FIPSMode).
-
-
-prime_curves(true, true) ->
-    [secp160k1,secp160r1,secp160r2,
-     secp192r1,secp192k1,secp224k1,secp224r1,secp256k1,secp256r1,secp384r1,
-     secp521r1,prime192v1,prime192v2,prime192v3,prime239v1,prime239v2,prime239v3,
-     prime256v1,wtls7,wtls9,wtls12,
-     brainpoolP160r1,brainpoolP160t1,brainpoolP192r1,brainpoolP192t1,
-     brainpoolP224r1,brainpoolP224t1,brainpoolP256r1,brainpoolP256t1,
-     brainpoolP320r1,brainpoolP320t1,brainpoolP384r1,brainpoolP384t1,
-     brainpoolP512r1,brainpoolP512t1];
-prime_curves(true, false) ->
-    [secp112r1,secp112r2,secp128r1,secp128r2,wtls6,wtls8]
-	++ prime_curves(true, true);
-prime_curves(_, _) ->
-    [].
-
-characteristic_two_curves(true, true) ->
-    [sect163k1,sect163r1,
-     sect163r2,sect193r1,sect193r2,sect233k1,sect233r1,sect239k1,sect283k1,
-     sect283r1,sect409k1,sect409r1,sect571k1,sect571r1,c2pnb163v1,c2pnb163v2,
-     c2pnb163v3,c2pnb176v1,c2tnb191v1,c2tnb191v2,c2tnb191v3,c2pnb208w1,c2tnb239v1,
-     c2tnb239v2,c2tnb239v3,c2pnb272w1,c2pnb304w1,c2tnb359v1,c2pnb368w1,c2tnb431r1,
-     wtls3,wtls5,wtls10,wtls11];
-characteristic_two_curves(true, _) ->
-    [sect113r1,sect113r2,sect131r1,sect131r2,wtls1,wtls4,ipsec3,ipsec4]
-        ++ characteristic_two_curves(true, true);
-characteristic_two_curves(_, _) ->
-    [].
+    proplists:get_value(curves,  crypto:supports()) -- [x25519,x448].
 
 curve(secp112r1) ->
     {