From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 6 Jun 2004 09:04:48 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: gnutls_1_1_11~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=560a706dfd8b93e625a58026bf17588a2e14bfb3;p=thirdparty%2Fgnutls.git

*** empty log message ***
---

diff --git a/src/tests.c b/src/tests.c
index 029a577b29..580bc5cc58 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -65,7 +65,7 @@ int ret, alert;
 	
 		handshake_output = ret;
 
-		if (ret < 0 && more_info != 0) {
+		if (ret < 0 && more_info > 1) {
 			if (ret == GNUTLS_E_WARNING_ALERT_RECEIVED
 			    || ret == GNUTLS_E_FATAL_ALERT_RECEIVED) {
 				alert = gnutls_alert_get( session);
@@ -264,10 +264,11 @@ const char* print;
 
 	ret = do_handshake( session);
 
-	printf("\n");
 	if (ret == SUCCEED) {
 		ret2 = gnutls_rsa_export_get_pubkey( session, &exp2, &mod2);
 		if (ret2 >= 0) {
+			printf("\n");
+
 			print = raw_to_string( exp2.data, exp2.size);
 			if (print)
 				printf(" Exponent [%d bits]: %s\n", exp2.size*8, print);
@@ -331,9 +332,10 @@ const char* print;
 
 	ret = do_handshake( session);
 	
-	printf("\n");
 	ret2 = gnutls_dh_get_group( session, &gen, &prime);
 	if (ret2 >= 0) {
+		printf("\n");
+
 		print = raw_to_string( gen.data, gen.size);
 		if (print)
 			printf(" Generator [%d bits]: %s\n", gen.size*8, print);
diff --git a/src/tls_test-gaa.c b/src/tls_test-gaa.c
index 42f4dc4ee0..2bf9b9737e 100644
--- a/src/tls_test-gaa.c
+++ b/src/tls_test-gaa.c
@@ -504,7 +504,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 	case GAAOPTID_verbose:
 	OK = 0;
 #line 21 "tls_test.gaa"
-{ gaaval->more_info = 1 ;};
+{ gaaval->more_info += 1 ;};
 
 		return GAA_OK;
 		break;
diff --git a/src/tls_test.gaa b/src/tls_test.gaa
index a1c607ee1a..b72febd900 100644
--- a/src/tls_test.gaa
+++ b/src/tls_test.gaa
@@ -18,7 +18,7 @@ option (p, port) INT "integer" { $pp = $1 } "The port to connect to."
 option (d, debug) INT "integer" { $debug = $1 } "Enable debugging" 
 
 #int more_info;
-option (v, verbose) { $more_info = 1 } "More verbose output"
+option (v, verbose) { $more_info += 1 } "More verbose output"
 
 option (h, help) { gaa_help(); exit(0); } "prints this help"