PR: 2716

Submitted by: Adam Langley <agl@google.com>

Fix handling of exporter return value and use OpenSSL indentation in
s_client, s_server.

2 files changed, 44 insertions, 38 deletions

diff --git a/apps/s_client.c b/apps/s_client.c
index 22e6762838..20f661ec50 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -362,7 +362,7 @@ static void sc_usage(void)
 # endif
 #endif
 	BIO_printf(bio_err," -legacy_renegotiation - enable use of legacy renegotiation (dangerous)\n");
-	BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list");
+	BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");
  	BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");
  	BIO_printf(bio_err," -keymatexportlen len  - Export len bytes of keying material (default 20)\n");
 	}
@@ -2077,30 +2077,33 @@ static void print_stuff(BIO *bio, SSL *s, int full)
 	}
  
 	SSL_SESSION_print(bio,SSL_get_session(s));
-	if (keymatexportlabel != NULL) {
+	if (keymatexportlabel != NULL)
+		{
 		BIO_printf(bio, "Keying material exporter:\n");
 		BIO_printf(bio, "    Label: '%s'\n", keymatexportlabel);
 		BIO_printf(bio, "    Length: %i bytes\n", keymatexportlen);
 		exportedkeymat = OPENSSL_malloc(keymatexportlen);
-		if (exportedkeymat != NULL) {
-			i = SSL_export_keying_material(s, exportedkeymat,
-						       keymatexportlen,
-						       keymatexportlabel,
-						     strlen(keymatexportlabel),
-						       NULL, 0, 0);
-			if (i != keymatexportlen) {
-				BIO_printf(bio,
-					   "    Error: return value %i\n", i);
-			} else {
+		if (exportedkeymat != NULL)
+			{
+			if (!SSL_export_keying_material(s, exportedkeymat,
+						        keymatexportlen,
+						        keymatexportlabel,
+						        strlen(keymatexportlabel),
+						        NULL, 0, 0))
+				{
+				BIO_printf(bio, "    Error\n");
+				}
+			else
+				{
 				BIO_printf(bio, "    Keying material: ");
 				for (i=0; i<keymatexportlen; i++)
 					BIO_printf(bio, "%02X",
 						   exportedkeymat[i]);
 				BIO_printf(bio, "\n");
-			}
+				}
 			OPENSSL_free(exportedkeymat);
+			}
 		}
-	}
 	BIO_printf(bio,"---\n");
 	if (peer != NULL)
 		X509_free(peer);
diff --git a/apps/s_server.c b/apps/s_server.c
index 5e3e4ac27a..fe29b4cae7 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -556,7 +556,7 @@ static void sv_usage(void)
 # ifndef OPENSSL_NO_NEXTPROTONEG
 	BIO_printf(bio_err," -nextprotoneg arg - set the advertised protocols for the NPN extension (comma-separated list)\n");
 # endif
-        BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list");
+        BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");
 #endif
 	BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");
 	BIO_printf(bio_err," -keymatexportlen len  - Export len bytes of keying material (default 20)\n");
@@ -2475,31 +2475,34 @@ static int init_ssl_connection(SSL *con)
 #endif /* OPENSSL_NO_KRB5 */
 	BIO_printf(bio_s_out, "Secure Renegotiation IS%s supported\n",
 		      SSL_get_secure_renegotiation_support(con) ? "" : " NOT");
- 	if (keymatexportlabel != NULL) {
- 		BIO_printf(bio_s_out, "Keying material exporter:\n");
- 		BIO_printf(bio_s_out, "    Label: '%s'\n", keymatexportlabel);
- 		BIO_printf(bio_s_out, "    Length: %i bytes\n",
+	if (keymatexportlabel != NULL)
+		{
+		BIO_printf(bio_s_out, "Keying material exporter:\n");
+		BIO_printf(bio_s_out, "    Label: '%s'\n", keymatexportlabel);
+		BIO_printf(bio_s_out, "    Length: %i bytes\n",
 			   keymatexportlen);
- 		exportedkeymat = OPENSSL_malloc(keymatexportlen);
- 		if (exportedkeymat != NULL) {
- 			i = SSL_export_keying_material(con, exportedkeymat,
-						       keymatexportlen,
-						       keymatexportlabel,
-						     strlen(keymatexportlabel),
-						       NULL, 0, 0);
- 			if (i != keymatexportlen) {
- 				BIO_printf(bio_s_out,
-					   "    Error: return value %i\n", i);
- 			} else {
- 				BIO_printf(bio_s_out, "    Keying material: ");
- 				for (i=0; i<keymatexportlen; i++)
- 					BIO_printf(bio_s_out, "%02X",
+		exportedkeymat = OPENSSL_malloc(keymatexportlen);
+		if (exportedkeymat != NULL)
+			{
+			if (!SSL_export_keying_material(con, exportedkeymat,
+						        keymatexportlen,
+						        keymatexportlabel,
+						        strlen(keymatexportlabel),
+						        NULL, 0, 0))
+				{
+				BIO_printf(bio_s_out, "    Error\n");
+				}
+			else
+				{
+				BIO_printf(bio_s_out, "    Keying material: ");
+				for (i=0; i<keymatexportlen; i++)
+					BIO_printf(bio_s_out, "%02X",
 						   exportedkeymat[i]);
- 				BIO_printf(bio_s_out, "\n");
- 			}
- 			OPENSSL_free(exportedkeymat);
- 		}
- 	}
+				BIO_printf(bio_s_out, "\n");
+				}
+			OPENSSL_free(exportedkeymat);
+			}
+		}
 
 	return(1);
 	}