diff options
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r-- | src/lib/libssl/t1_lib.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index 0a00e4da7f..30305e6b2f 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_lib.c,v 1.144 2018/08/24 18:10:25 jsing Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.145 2018/11/05 03:49:44 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -608,20 +608,11 @@ tls1_check_ec_server_key(SSL *s) | |||
608 | int | 608 | int |
609 | tls1_check_ec_tmp_key(SSL *s) | 609 | tls1_check_ec_tmp_key(SSL *s) |
610 | { | 610 | { |
611 | EC_KEY *ec = s->cert->ecdh_tmp; | ||
612 | uint16_t curve_id; | ||
613 | |||
614 | /* Need a shared curve. */ | 611 | /* Need a shared curve. */ |
615 | if (tls1_get_shared_curve(s) != NID_undef) | 612 | if (tls1_get_shared_curve(s) != NID_undef) |
616 | return (1); | 613 | return (1); |
617 | 614 | ||
618 | if (ec == NULL) | 615 | return (0); |
619 | return (0); | ||
620 | |||
621 | if (tls1_set_ec_id(&curve_id, NULL, ec) != 1) | ||
622 | return (0); | ||
623 | |||
624 | return tls1_check_ec_key(s, &curve_id, NULL); | ||
625 | } | 616 | } |
626 | 617 | ||
627 | /* | 618 | /* |