summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--ssl/s3_clnt.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 32bd5c5958..e03c46f921 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,8 @@
Changes between 1.0.2e and 1.0.2f [xx XXX xxxx]
- *)
+ *) Reject DH handshakes with parameters shorter than 1024 bits.
+ [Kurt Roeckx]
Changes between 1.0.2d and 1.0.2e [3 Dec 2015]
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 8cbf46ad2f..04cc9f54a9 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -3610,7 +3610,7 @@ int ssl3_check_cert_and_algorithm(SSL *s)
DH_free(dh_srvr);
}
- 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)) {
SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_DH_KEY_TOO_SMALL);
goto f_err;