OpenSSL 0.9.5a merge

1 files changed, 22 insertions, 5 deletions

diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index 48f247ceac..0596b7c5b8 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -191,16 +191,33 @@ CERT *ssl_cert_dup(CERT *cert)
 #ifndef NO_DH
         if (cert->dh_tmp != NULL)
                 {
-                /* DH parameters don't have a reference count (and cannot
-                 * reasonably be shared anyway, as the secret exponent may
-                 * be created just when it is needed -- earlier library
-                 * versions did not pay attention to this) */
+                /* DH parameters don't have a reference count */
                 ret->dh_tmp = DHparams_dup(cert->dh_tmp);
                 if (ret->dh_tmp == NULL)
                         {
-                        SSLerr(SSL_F_SSL_CERT_NEW, ERR_R_DH_LIB);
+                        SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_DH_LIB);
                         goto err;
                         }
+                if (cert->dh_tmp->priv_key)
+                        {
+                        BIGNUM *b = BN_dup(cert->dh_tmp->priv_key);
+                        if (!b)
+                                {
+                                SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_BN_LIB);
+                                goto err;
+                                }
+                        ret->dh_tmp->priv_key = b;
+                        }
+                if (cert->dh_tmp->pub_key)
+                        {
+                        BIGNUM *b = BN_dup(cert->dh_tmp->pub_key);
+                        if (!b)
+                                {
+                                SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_BN_LIB);
+                                goto err;
+                                }
+                        ret->dh_tmp->pub_key = b;
+                        }
                 }
         ret->dh_tmp_cb = cert->dh_tmp_cb;
 #endif