fix no-dh configure option; patch supplied by Peter Meerwald

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 7908dcccdb8a8d0552059f4f802537a30cc1ecff..452a0822d9a3e2a4f87ce4f2aae27f6e31a96e02 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -296,7 +296,7 @@ CERT *ssl_cert_dup(CERT *cert)
 
        return(ret);
        
-#ifndef OPENSSL_NO_DH /* avoid 'unreferenced label' warning if OPENSSL_NO_DH is defined */
+#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_ECDH)
 err:
 #endif
 #ifndef OPENSSL_NO_RSA

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 137b68b857351fa16cf55030c1daf3ad2599a726..517657c0240d01ffad924bb6192214175731a4e7 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -2234,6 +2234,7 @@ static DH *get_dh1024dsa()
        dh->length = 160;
        return(dh);
        }
+#endif
 
 static int do_test_cipherlist(void)
        {
@@ -2291,4 +2292,3 @@ static int do_test_cipherlist(void)
 
        return 1;
        }
-#endif