Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(779)

Unified Diff: net/third_party/nss/patches/sslkeylogerror.patch

Issue 11275240: Update net/third_party/nss/ssl to NSS 3.14. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Upload before commit Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/third_party/nss/patches/sslkeylogerror.patch
===================================================================
--- net/third_party/nss/patches/sslkeylogerror.patch (revision 166942)
+++ net/third_party/nss/patches/sslkeylogerror.patch (working copy)
@@ -1,8 +1,7 @@
-diff --git a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock.c
-index 1823a1c..2a93dae 100644
---- a/net/third_party/nss/ssl/sslsock.c
-+++ b/net/third_party/nss/ssl/sslsock.c
-@@ -2934,11 +2934,15 @@ ssl_SetDefaultsFromEnvironment(void)
+diff -pu -r a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock.c
+--- a/net/third_party/nss/ssl/sslsock.c 2012-11-09 16:16:23.715038258 -0800
++++ b/net/third_party/nss/ssl/sslsock.c 2012-11-09 16:19:18.517565894 -0800
+@@ -2906,11 +2906,15 @@ ssl_SetDefaultsFromEnvironment(void)
ev = getenv("SSLKEYLOGFILE");
if (ev && ev[0]) {
ssl_keylog_iob = fopen(ev, "a");
@@ -16,9 +15,9 @@
+ 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));
}
-- 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]) {
« no previous file with comments | « net/third_party/nss/patches/secretexporterlocks.patch ('k') | net/third_party/nss/patches/sslprotocolvariant.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698