commit 1e0784ff95cd69090e26e2205bfec6305038db56
author Ben Laurie <ben@links.org> Fri Jan 01 15:39:31 2016 +0000
committer Ben Laurie <ben@links.org> Fri Jan 01 15:40:55 2016 +0000
tree 182cee870ec2385163a2198360163aec9724db3d
parent f2c147685a88790527aa1706ef5d35a04ca5e226

Fix no-dh.

Reviewed-by: Stephen Henson <steve@openssl.org>

ssl/s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 097ccac..e3e4fd3 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3357,7 +3357,7 @@
     if ((s3 = OPENSSL_zalloc(sizeof(*s3))) == NULL)
         goto err;
     s->s3 = s3;
-    
+
 #ifndef OPENSSL_NO_SRP
     if (!SSL_SRP_CTX_init(s))
           goto err;
@@ -4279,8 +4279,8 @@
 # ifndef OPENSSL_NO_DSA
         p[ret++] = SSL3_CT_DSS_EPHEMERAL_DH;
 # endif
-    }
 #endif                          /* !OPENSSL_NO_DH */
+    }
 #ifndef OPENSSL_NO_RSA
     if (!(alg_a & SSL_aRSA))
         p[ret++] = SSL3_CT_RSA_SIGN;
@@ -4631,6 +4631,7 @@
     return rv;
 }
 
+#ifndef OPENSSL_NO_DH
 EVP_PKEY *ssl_dh_to_pkey(DH *dh)
 {
     EVP_PKEY *ret;
@@ -4643,3 +4644,4 @@
     }
     return ret;
 }
+#endif