the attached patch fixes the compile if no-dh is specified for Configure or
if no-dh but not no-ecdh is specified

regards,
Peter

--

Peter Meerwald
Kaigasse 3 / 8
A-5020 Salzburg / AUSTRIA
+43-664-2444418 (mobile)
diff -ur openssl-0.9.8a-orig/ssl/ssl_cert.c openssl-0.9.8a-work/ssl/ssl_cert.c
--- openssl-0.9.8a-orig/ssl/ssl_cert.c  2005-08-08 21:39:29.000000000 +0200
+++ openssl-0.9.8a-work/ssl/ssl_cert.c  2006-02-24 18:28:59.140625000 +0100
@@ -296,7 +296,7 @@
 
        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 -ur openssl-0.9.8a-orig/ssl/ssltest.c openssl-0.9.8a-work/ssl/ssltest.c
--- openssl-0.9.8a-orig/ssl/ssltest.c   2005-10-02 14:26:06.000000000 +0200
+++ openssl-0.9.8a-work/ssl/ssltest.c   2006-02-24 18:19:10.640625000 +0100
@@ -2234,6 +2234,7 @@
        dh->length = 160;
        return(dh);
        }
+#endif
 
 static int do_test_cipherlist(void)
        {
@@ -2287,4 +2288,3 @@
 
        return 1;
        }
-#endif

Reply via email to