[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  1e0784ff95cd69090e26e2205bfec6305038db56 (commit)
      from  f2c147685a88790527aa1706ef5d35a04ca5e226 (commit)


- Log -----------------------------------------------------------------
commit 1e0784ff95cd69090e26e2205bfec6305038db56
Author: Ben Laurie <ben at links.org>
Date:   Fri Jan 1 15:39:31 2016 +0000

    Fix no-dh.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/s3_lib.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 @@ int ssl3_new(SSL *s)
     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 @@ int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
 # 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 @@ int ssl_derive(SSL *s, EVP_PKEY *privkey, EVP_PKEY *pubkey)
     return rv;
 }
 
+#ifndef OPENSSL_NO_DH
 EVP_PKEY *ssl_dh_to_pkey(DH *dh)
 {
     EVP_PKEY *ret;
@@ -4643,3 +4644,4 @@ EVP_PKEY *ssl_dh_to_pkey(DH *dh)
     }
     return ret;
 }
+#endif