diff options
| author | Matt Caswell <matt@openssl.org> | 2021-01-20 13:38:43 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-02-05 16:22:42 +0100 |
| commit | 306b8e7e19f6c5019a9fc4050c5de6ebe7135c1f (patch) | |
| tree | a43fb6227655f8270191cb2fdaf24146b7edc64c /ssl | |
| parent | Remove compile time guard checking from ssl3_get_req_cert_type (diff) | |
| download | openssl-306b8e7e19f6c5019a9fc4050c5de6ebe7135c1f.tar.xz openssl-306b8e7e19f6c5019a9fc4050c5de6ebe7135c1f.zip | |
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')
| -rw-r--r-- | ssl/ssl_conf.c | 1 | ||||
| -rw-r--r-- | ssl/t1_lib.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index 2e8240c73b..09e2ee2e3e 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -226,7 +226,6 @@ static int cmd_Curves(SSL_CONF_CTX *cctx, const char *value) static int cmd_ECDHParameters(SSL_CONF_CTX *cctx, const char *value) { int rv = 1; - int nid; /* Ignore values supported by 1.0.2 for the automatic selection */ if ((cctx->flags & SSL_CONF_FLAG_FILE) 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; } |