generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix no-dh.

Browse Source 
Reviewed-by: Stephen Henson <steve@openssl.org>
This commit is contained in:
Ben Laurie
2016-01-01 15:39:31 +00:00
parent f2c147685a
commit 1e0784ff95
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/s3_lib.c
View File

@@ -4279,8 +4279,8 @@ int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
# ifndef OPENSSL_NO_DSA # ifndef OPENSSL_NO_DSA
p[ret++] = SSL3_CT_DSS_EPHEMERAL_DH; p[ret++] = SSL3_CT_DSS_EPHEMERAL_DH;
# endif # endif
}
#endif /* !OPENSSL_NO_DH */ #endif /* !OPENSSL_NO_DH */
}
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
if (!(alg_a & SSL_aRSA)) if (!(alg_a & SSL_aRSA))
p[ret++] = SSL3_CT_RSA_SIGN; p[ret++] = SSL3_CT_RSA_SIGN;
@@ -4631,6 +4631,7 @@ int ssl_derive(SSL *s, EVP_PKEY *privkey, EVP_PKEY *pubkey)
return rv; return rv;
} }
#ifndef OPENSSL_NO_DH
EVP_PKEY *ssl_dh_to_pkey(DH *dh) EVP_PKEY *ssl_dh_to_pkey(DH *dh)
{ {
EVP_PKEY *ret; EVP_PKEY *ret;
@@ -4643,3 +4644,4 @@ EVP_PKEY *ssl_dh_to_pkey(DH *dh)
} }
return ret; return ret;
} }
#endif