summaryrefslogtreecommitdiffstats
path: root/ssl/t1_lib.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2021-01-20 12:38:43 +0000
committerMatt Caswell <matt@openssl.org>2021-02-05 15:22:42 +0000
commit306b8e7e19f6c5019a9fc4050c5de6ebe7135c1f (patch)
treea43fb6227655f8270191cb2fdaf24146b7edc64c /ssl/t1_lib.c
parent3de751e7f0791f5c9778faf44631555f05e24fad (diff)
Add the nist group names as aliases for the normal TLS group names
By recognising the nist group names directly we can avoid having to call EC_curve_nist2nid in libssl, which is not available in a no-ec build. Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13916)
Diffstat (limited to 'ssl/t1_lib.c')
-rw-r--r--ssl/t1_lib.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 6bc33215c1..571a1ec2c4 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -440,10 +440,7 @@ static uint16_t tls1_group_name2id(SSL_CTX *ctx, const char *name)
for (i = 0; i < ctx->group_list_len; i++) {
if (strcmp(ctx->group_list[i].tlsname, name) == 0
- || (nid != NID_undef
- && nid == tls1_group_id2nid(ctx->group_list[i].group_id,
- 0))
- )
+ || strcmp(ctx->group_list[i].realname, name) == 0)
return ctx->group_list[i].group_id;
}