fix no-dh configure option; patch supplied by Peter Meerwald
authorNils Larsch <nils@openssl.org>
Fri, 24 Feb 2006 17:58:43 +0000 (17:58 +0000)
committerNils Larsch <nils@openssl.org>
Fri, 24 Feb 2006 17:58:43 +0000 (17:58 +0000)
ssl/ssl_cert.c
ssl/ssltest.c

index 7908dcc..452a082 100644 (file)
@@ -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
index 9b7a387..dfe18b0 100644 (file)
@@ -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