From: Matt Caswell Date: Wed, 1 Jul 2020 11:20:49 +0000 (+0100) Subject: Ensure we excluse ec2m curves if ec2m is disabled X-Git-Tag: openssl-3.0.0-alpha5~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f1d0b35c12f50e971ef626ff9bbf35a53f9a66d;p=thirdparty%2Fopenssl.git Ensure we excluse ec2m curves if ec2m is disabled Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/12292) --- diff --git a/providers/common/capabilities.c b/providers/common/capabilities.c index a41d3990f0d..a60620d8a25 100644 --- a/providers/common/capabilities.c +++ b/providers/common/capabilities.c @@ -97,26 +97,34 @@ static const TLS_GROUP_CONSTANTS group_list[35] = { static const OSSL_PARAM param_group_list[][10] = { #ifndef OPENSSL_NO_EC +# ifndef OPENSSL_NO_EC2M TLS_GROUP_ENTRY("sect163k1", "sect163k1", "EC", 0), +# endif # ifndef FIPS_MODULE TLS_GROUP_ENTRY("sect163r1", "sect163r1", "EC", 1), # endif +# ifndef OPENSSL_NO_EC2M TLS_GROUP_ENTRY("sect163r2", "sect163r2", "EC", 2), +# endif # ifndef FIPS_MODULE TLS_GROUP_ENTRY("sect193r1", "sect193r1", "EC", 3), TLS_GROUP_ENTRY("sect193r2", "sect193r2", "EC", 4), # endif +# ifndef OPENSSL_NO_EC2M TLS_GROUP_ENTRY("sect233k1", "sect233k1", "EC", 5), TLS_GROUP_ENTRY("sect233r1", "sect233r1", "EC", 6), +# endif # ifndef FIPS_MODULE TLS_GROUP_ENTRY("sect239k1", "sect239k1", "EC", 7), # endif +# ifndef OPENSSL_NO_EC2M TLS_GROUP_ENTRY("sect283k1", "sect283k1", "EC", 8), TLS_GROUP_ENTRY("sect283r1", "sect283r1", "EC", 9), TLS_GROUP_ENTRY("sect409k1", "sect409k1", "EC", 10), TLS_GROUP_ENTRY("sect409r1", "sect409r1", "EC", 11), TLS_GROUP_ENTRY("sect571k1", "sect571k1", "EC", 12), TLS_GROUP_ENTRY("sect571r1", "sect571r1", "EC", 13), +# endif # ifndef FIPS_MODULE TLS_GROUP_ENTRY("secp160k1", "secp160k1", "EC", 14), TLS_GROUP_ENTRY("secp160r1", "secp160r1", "EC", 15),