Bug 762763: Update the SSL trace message and the comment in the SSL key log
authorwtc%google.com
Tue, 12 Jun 2012 00:29:34 +0000
changeset 10367 e83eeff08cada278fe62987ba6df524438d46f41
parent 10366 e0fca2242a89130019cd1434cfc02f841b6dcb59
child 10368 8011ef5d178f39acfb83e2522cb320f53aacd033
push idunknown
push userunknown
push dateunknown
bugs762763
Bug 762763: Update the SSL trace message and the comment in the SSL key log file. The patch is contributed by Adam Langley <agl@chromium.org>. r=wtc.
security/nss/lib/ssl/sslsock.c
--- a/security/nss/lib/ssl/sslsock.c
+++ b/security/nss/lib/ssl/sslsock.c
@@ -2799,20 +2799,20 @@ ssl_SetDefaultsFromEnvironment(void)
 	    ssl_debug = atoi(ev);
 	    SSL_TRACE(("SSL: debugging set to %d", ssl_debug));
 	}
 #endif /* DEBUG */
 	ev = getenv("SSLKEYLOGFILE");
 	if (ev && ev[0]) {
 	    ssl_keylog_iob = fopen(ev, "a");
 	    if (ftell(ssl_keylog_iob) == 0) {
-		fputs("# pre-master secret log file, generated by NSS\n",
+		fputs("# SSL/TLS secrets log file, generated by NSS\n",
 		      ssl_keylog_iob);
 	    }
-	    SSL_TRACE(("SSL: logging pre-master secrets to %s", ev));
+	    SSL_TRACE(("SSL: logging SSL/TLS secrets to %s", ev));
 	}
 #ifndef NO_PKCS11_BYPASS
 	ev = getenv("SSLBYPASS");
 	if (ev && ev[0]) {
 	    ssl_defaults.bypassPKCS11 = (ev[0] == '1');
 	    SSL_TRACE(("SSL: bypass default set to %d", \
 		      ssl_defaults.bypassPKCS11));
 	}