summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/d1_srvr.c8
-rw-r--r--src/lib/libssl/s3_srvr.c11
-rw-r--r--src/lib/libssl/src/ssl/d1_srvr.c8
-rw-r--r--src/lib/libssl/src/ssl/s3_srvr.c11
4 files changed, 10 insertions, 28 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)) {
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 18663c6ee3..cba875a3e6 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_srvr.c,v 1.84 2014/09/19 14:32:24 tedu Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.85 2014/09/27 11:03:43 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 *
@@ -1436,8 +1436,8 @@ ssl3_send_server_key_exchange(SSL *s)
1436 ERR_R_DH_LIB); 1436 ERR_R_DH_LIB);
1437 goto err; 1437 goto err;
1438 } 1438 }
1439
1440 s->s3->tmp.dh = dh; 1439 s->s3->tmp.dh = dh;
1440
1441 if ((dhp->pub_key == NULL || dhp->priv_key == NULL || 1441 if ((dhp->pub_key == NULL || dhp->priv_key == NULL ||
1442 (s->options & SSL_OP_SINGLE_DH_USE))) { 1442 (s->options & SSL_OP_SINGLE_DH_USE))) {
1443 if (!DH_generate_key(dh)) { 1443 if (!DH_generate_key(dh)) {
@@ -1482,18 +1482,13 @@ ssl3_send_server_key_exchange(SSL *s)
1482 } 1482 }
1483 1483
1484 /* Duplicate the ECDH structure. */ 1484 /* Duplicate the ECDH structure. */
1485 if (ecdhp == NULL) {
1486 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
1487 ERR_R_ECDH_LIB);
1488 goto err;
1489 }
1490 if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) { 1485 if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) {
1491 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, 1486 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
1492 ERR_R_ECDH_LIB); 1487 ERR_R_ECDH_LIB);
1493 goto err; 1488 goto err;
1494 } 1489 }
1495
1496 s->s3->tmp.ecdh = ecdh; 1490 s->s3->tmp.ecdh = ecdh;
1491
1497 if ((EC_KEY_get0_public_key(ecdh) == NULL) || 1492 if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
1498 (EC_KEY_get0_private_key(ecdh) == NULL) || 1493 (EC_KEY_get0_private_key(ecdh) == NULL) ||
1499 (s->options & SSL_OP_SINGLE_ECDH_USE)) { 1494 (s->options & SSL_OP_SINGLE_ECDH_USE)) {
diff --git a/src/lib/libssl/src/ssl/d1_srvr.c b/src/lib/libssl/src/ssl/d1_srvr.c
index 051d1e1ccf..68441fa63a 100644
--- a/src/lib/libssl/src/ssl/d1_srvr.c
+++ b/src/lib/libssl/src/ssl/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)) {
diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c
index 18663c6ee3..cba875a3e6 100644
--- a/src/lib/libssl/src/ssl/s3_srvr.c
+++ b/src/lib/libssl/src/ssl/s3_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_srvr.c,v 1.84 2014/09/19 14:32:24 tedu Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.85 2014/09/27 11:03:43 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 *
@@ -1436,8 +1436,8 @@ ssl3_send_server_key_exchange(SSL *s)
1436 ERR_R_DH_LIB); 1436 ERR_R_DH_LIB);
1437 goto err; 1437 goto err;
1438 } 1438 }
1439
1440 s->s3->tmp.dh = dh; 1439 s->s3->tmp.dh = dh;
1440
1441 if ((dhp->pub_key == NULL || dhp->priv_key == NULL || 1441 if ((dhp->pub_key == NULL || dhp->priv_key == NULL ||
1442 (s->options & SSL_OP_SINGLE_DH_USE))) { 1442 (s->options & SSL_OP_SINGLE_DH_USE))) {
1443 if (!DH_generate_key(dh)) { 1443 if (!DH_generate_key(dh)) {
@@ -1482,18 +1482,13 @@ ssl3_send_server_key_exchange(SSL *s)
1482 } 1482 }
1483 1483
1484 /* Duplicate the ECDH structure. */ 1484 /* Duplicate the ECDH structure. */
1485 if (ecdhp == NULL) {
1486 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
1487 ERR_R_ECDH_LIB);
1488 goto err;
1489 }
1490 if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) { 1485 if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) {
1491 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, 1486 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
1492 ERR_R_ECDH_LIB); 1487 ERR_R_ECDH_LIB);
1493 goto err; 1488 goto err;
1494 } 1489 }
1495
1496 s->s3->tmp.ecdh = ecdh; 1490 s->s3->tmp.ecdh = ecdh;
1491
1497 if ((EC_KEY_get0_public_key(ecdh) == NULL) || 1492 if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
1498 (EC_KEY_get0_private_key(ecdh) == NULL) || 1493 (EC_KEY_get0_private_key(ecdh) == NULL) ||
1499 (s->options & SSL_OP_SINGLE_ECDH_USE)) { 1494 (s->options & SSL_OP_SINGLE_ECDH_USE)) {
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-10-27 06:21:54 +0000