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

Change minimum DH size from 768 to 1024

Browse Source 
Reviewed-by: Viktor Dukhovni <openssl-users@dukhovni.org>
This commit is contained in:
Kurt Roeckx 2016-01-10 13:55:08 +01:00
parent ff9cef0266
commit f5fc9404c2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -4,7 +4,8 @@
Changes between 1.0.1q and 1.0.1r [xx XXX xxxx] Changes between 1.0.1q and 1.0.1r [xx XXX xxxx]
*) *) Reject DH handshakes with parameters shorter than 1024 bits.
[Kurt Roeckx]
Changes between 1.0.1p and 1.0.1q [3 Dec 2015] Changes between 1.0.1p and 1.0.1q [3 Dec 2015]

2
ssl/s3_clnt.c
View File

@ -3417,7 +3417,7 @@ int ssl3_check_cert_and_algorithm(SSL *s)
/* Check DHE only: static DH not implemented. */ /* Check DHE only: static DH not implemented. */
if (alg_k & SSL_kEDH) { if (alg_k & SSL_kEDH) {
int dh_size = BN_num_bits(dh->p); int dh_size = BN_num_bits(dh->p);
if ((!SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && dh_size < 768) if ((!SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && dh_size < 1024)
|| (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && dh_size < 512)) { || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && dh_size < 512)) {
SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_DH_KEY_TOO_SMALL); SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_DH_KEY_TOO_SMALL);
goto f_err; goto f_err;