summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_srvr.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/d1_srvr.c')
-rw-r--r--src/lib/libssl/d1_srvr.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 051d1e1ccf..68441fa63a 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: d1_srvr.c,v 1.38 2014/09/07 12:16:23 jsing Exp $ */ 1/* $OpenBSD: d1_srvr.c,v 1.39 2014/09/27 11:03:43 jsing Exp $ */
2/* 2/*
3 * DTLS implementation written by Nagendra Modadugu 3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -1109,16 +1109,12 @@ dtls1_send_server_key_exchange(SSL *s)
1109 } 1109 }
1110 1110
1111 /* Duplicate the ECDH structure. */ 1111 /* Duplicate the ECDH structure. */
1112 if (ecdhp == NULL) {
1113 SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
1114 goto err;
1115 }
1116 if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) { 1112 if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) {
1117 SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB); 1113 SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
1118 goto err; 1114 goto err;
1119 } 1115 }
1120
1121 s->s3->tmp.ecdh = ecdh; 1116 s->s3->tmp.ecdh = ecdh;
1117
1122 if ((EC_KEY_get0_public_key(ecdh) == NULL) || 1118 if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
1123 (EC_KEY_get0_private_key(ecdh) == NULL) || 1119 (EC_KEY_get0_private_key(ecdh) == NULL) ||
1124 (s->options & SSL_OP_SINGLE_ECDH_USE)) { 1120 (s->options & SSL_OP_SINGLE_ECDH_USE)) {