diff options
Diffstat (limited to 'lib/libssl/t1_lib.c')
| -rw-r--r-- | lib/libssl/t1_lib.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lib/libssl/t1_lib.c b/lib/libssl/t1_lib.c index ea44e7579a8..42fd18fe2d6 100644 --- a/lib/libssl/t1_lib.c +++ b/lib/libssl/t1_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_lib.c,v 1.123 2017/08/09 22:24:25 jsing Exp $ */ +/* $OpenBSD: t1_lib.c,v 1.124 2017/08/10 17:18:38 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -611,18 +611,13 @@ tls1_check_ec_tmp_key(SSL *s) EC_KEY *ec = s->cert->ecdh_tmp; uint16_t curve_id; - if (s->cert->ecdh_tmp_auto != 0) { - /* Need a shared curve. */ - if (tls1_get_shared_curve(s) != NID_undef) - return (1); - return (0); - } + /* Need a shared curve. */ + if (tls1_get_shared_curve(s) != NID_undef) + return (1); - if (ec == NULL) { - if (s->cert->ecdh_tmp_cb != NULL) - return (1); + if (ec == NULL) return (0); - } + if (tls1_set_ec_id(&curve_id, NULL, ec) != 1) return (0); |