From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 30 Jun 2017 13:32:58 +0000 (+0200)
Subject: cli,serv: no longer print parameters when FFDHE groups are used
X-Git-Tag: gnutls_3_6_0~248
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ba0306e2b2e877fb72da19ecf6aefd6a3ae9bee;p=thirdparty%2Fgnutls.git

cli,serv: no longer print parameters when FFDHE groups are used

The negotiated RFC7919 group is now printed as part of the Description string,
and there is no reason to print more information on parameters defined by
the protocol.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
---

diff --git a/src/common.c b/src/common.c
index 762563cefd..86d4fd51ca 100644
--- a/src/common.c
+++ b/src/common.c
@@ -295,6 +295,13 @@ static void
 print_dh_info(gnutls_session_t session, const char *str, int print)
 {
 #if defined(ENABLE_DHE) || defined(ENABLE_ANON)
+	unsigned group;
+
+	group = gnutls_group_get(session);
+	if (group != 0) {
+		return;
+	}
+
 	printf("- %sDiffie-Hellman parameters\n", str);
 	printf(" - Using prime: %d bits\n",
 	       gnutls_dh_get_prime_bits(session));