From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Wed, 26 Mar 2014 08:52:43 +0000 (+0100)
Subject: add a check for invalid DH parameters.
X-Git-Tag: gnutls_3_3_0pre0~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f029209722489cb0767219e6841adcc54fa979da;p=thirdparty%2Fgnutls.git

add a check for invalid DH parameters.
---

diff --git a/lib/auth/dh_common.c b/lib/auth/dh_common.c
index 3451e8236e..54a47bd8ba 100644
--- a/lib/auth/dh_common.c
+++ b/lib/auth/dh_common.c
@@ -301,6 +301,12 @@ _gnutls_dh_common_print_server_kx(gnutls_session_t session,
 	int ret;
 	unsigned q_bits = session->key.dh_params.flags;
 
+	if (q_bits < 192) {
+		gnutls_assert();
+		_gnutls_debug_log("too small q_bits value for DH: %u\n", q_bits);
+		q_bits = 0; /* auto-detect */
+	}
+
 	/* Y=g^x mod p */
 	ret =
 	    _gnutls_pk_generate_keys(GNUTLS_PK_DH, q_bits,