From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 5 Nov 2014 18:19:50 +0000 (+0100)
Subject: gnutls-cli-debug: fixes in tests to prevent false negatives
X-Git-Tag: gnutls_3_4_0~678
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db07a1d3bcd2e15cc1a8c2a0971c6e38c321ca73;p=thirdparty%2Fgnutls.git

gnutls-cli-debug: fixes in tests to prevent false negatives
---

diff --git a/src/tests.c b/src/tests.c
index e3a3895215..78d39e38cd 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -226,7 +226,7 @@ test_code_t test_safe_renegotiation(gnutls_session_t session)
 
 	sprintf(prio_str, INIT_STR
 		ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
-		":" ALL_KX ":%%SAFE_RENEGOTIATION", protocol_str);
+		":" ALL_KX ":%s:%%SAFE_RENEGOTIATION", rest, protocol_str);
 	_gnutls_priority_set_direct(session, prio_str);
 
 	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -242,7 +242,7 @@ test_code_t test_etm(gnutls_session_t session)
 
 	sprintf(prio_str, INIT_STR
 		ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
-		":" ALL_KX, protocol_str);
+		":%s:" ALL_KX, rest, protocol_str);
 	_gnutls_priority_set_direct(session, prio_str);
 
 	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -264,7 +264,7 @@ test_code_t test_ext_master_secret(gnutls_session_t session)
 
 	sprintf(prio_str, INIT_STR
 		ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
-		":" ALL_KX, protocol_str);
+		":%s:" ALL_KX, rest, protocol_str);
 	_gnutls_priority_set_direct(session, prio_str);
 
 	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -284,6 +284,9 @@ test_code_t test_safe_renegotiation_scsv(gnutls_session_t session)
 {
 	int ret;
 
+	if (ssl3_ok == 0)
+		return TEST_IGNORE;
+
 	sprintf(prio_str, INIT_STR
 		ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":+VERS-SSL3.0:"
 		ALL_MACS ":" ALL_KX ":%%SAFE_RENEGOTIATION");