summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorNils Larsch <nils@openssl.org>2006-02-24 17:58:35 +0000
committerNils Larsch <nils@openssl.org>2006-02-24 17:58:35 +0000
commit41d4d6721ccaac17337b940c4de1d13b96af8c0b (patch)
treeb83a32480372a5cb54271d989dd98e55013deb91 /ssl
parent9d01d504590c4c640fd9dc0b1fdff11306fe524a (diff)
fix no-dh configure option; patch supplied by Peter Meerwald
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_cert.c2
-rw-r--r--ssl/ssltest.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 7908dcccdb..452a0822d9 100644
--- 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 137b68b857..517657c024 100644
--- 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