There is not much point checking ecdhp is not NULL... twice.

ok miod@

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 @@
-/* $OpenBSD: d1_srvr.c,v 1.38 2014/09/07 12:16:23 jsing Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.39 2014/09/27 11:03:43 jsing Exp $ */
 /* 
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
@@ -1109,16 +1109,12 @@ dtls1_send_server_key_exchange(SSL *s)
                         }
 
                         /* Duplicate the ECDH structure. */
-                        if (ecdhp == NULL) {
-                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
-                                goto err;
-                        }
                         if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) {
                                 SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
                                 goto err;
                         }
-
                         s->s3->tmp.ecdh = ecdh;
+
                         if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
                             (EC_KEY_get0_private_key(ecdh) == NULL) ||
                             (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 @@
-/* $OpenBSD: s3_srvr.c,v 1.84 2014/09/19 14:32:24 tedu Exp $ */
+/* $OpenBSD: s3_srvr.c,v 1.85 2014/09/27 11:03:43 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1436,8 +1436,8 @@ ssl3_send_server_key_exchange(SSL *s)
                                     ERR_R_DH_LIB);
                                 goto err;
                         }
-
                         s->s3->tmp.dh = dh;
+
                         if ((dhp->pub_key == NULL || dhp->priv_key == NULL ||
                             (s->options & SSL_OP_SINGLE_DH_USE))) {
                                 if (!DH_generate_key(dh)) {
@@ -1482,18 +1482,13 @@ ssl3_send_server_key_exchange(SSL *s)
                         }
 
                         /* Duplicate the ECDH structure. */
-                        if (ecdhp == NULL) {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
-                                    ERR_R_ECDH_LIB);
-                                goto err;
-                        }
                         if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
                                     ERR_R_ECDH_LIB);
                                 goto err;
                         }
-
                         s->s3->tmp.ecdh = ecdh;
+
                         if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
                             (EC_KEY_get0_private_key(ecdh) == NULL) ||
                             (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 @@
-/* $OpenBSD: d1_srvr.c,v 1.38 2014/09/07 12:16:23 jsing Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.39 2014/09/27 11:03:43 jsing Exp $ */
 /* 
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
@@ -1109,16 +1109,12 @@ dtls1_send_server_key_exchange(SSL *s)
                         }
 
                         /* Duplicate the ECDH structure. */
-                        if (ecdhp == NULL) {
-                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
-                                goto err;
-                        }
                         if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) {
                                 SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
                                 goto err;
                         }
-
                         s->s3->tmp.ecdh = ecdh;
+
                         if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
                             (EC_KEY_get0_private_key(ecdh) == NULL) ||
                             (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 @@
-/* $OpenBSD: s3_srvr.c,v 1.84 2014/09/19 14:32:24 tedu Exp $ */
+/* $OpenBSD: s3_srvr.c,v 1.85 2014/09/27 11:03:43 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1436,8 +1436,8 @@ ssl3_send_server_key_exchange(SSL *s)
                                     ERR_R_DH_LIB);
                                 goto err;
                         }
-
                         s->s3->tmp.dh = dh;
+
                         if ((dhp->pub_key == NULL || dhp->priv_key == NULL ||
                             (s->options & SSL_OP_SINGLE_DH_USE))) {
                                 if (!DH_generate_key(dh)) {
@@ -1482,18 +1482,13 @@ ssl3_send_server_key_exchange(SSL *s)
                         }
 
                         /* Duplicate the ECDH structure. */
-                        if (ecdhp == NULL) {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
-                                    ERR_R_ECDH_LIB);
-                                goto err;
-                        }
                         if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
                                     ERR_R_ECDH_LIB);
                                 goto err;
                         }
-
                         s->s3->tmp.ecdh = ecdh;
+
                         if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
                             (EC_KEY_get0_private_key(ecdh) == NULL) ||
                             (s->options & SSL_OP_SINGLE_ECDH_USE)) {