diff options
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; } |