From f71165b556c307ea490b4fb5c59682f1e2678b20 Mon Sep 17 00:00:00 2001
From: Nils Larsch <nils@openssl.org>
Date: Fri, 24 Feb 2006 17:58:43 +0000
Subject: [PATCH] fix no-dh configure option; patch supplied by Peter Meerwald

---
 ssl/ssl_cert.c | 2 +-
 ssl/ssltest.c  | 2 +-
 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 9b7a387ba3..dfe18b0f1c 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
-- 
2.25.1