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

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

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make the changes rsleevi suggested Created 7 years, 8 months 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 196870)
+++ net/third_party/nss/patches/sslkeylogerror.patch (working copy)
@@ -1,23 +0,0 @@
-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");
-- if (ftell(ssl_keylog_iob) == 0) {
-- fputs("# SSL/TLS secrets log file, generated by NSS\n",
-- ssl_keylog_iob);
-+ if (!ssl_keylog_iob) {
-+ SSL_TRACE(("Failed to open key log file"));
-+ } else {
-+ if (ftell(ssl_keylog_iob) == 0) {
-+ fputs("# SSL/TLS secrets log file, generated by NSS\n",
-+ ssl_keylog_iob);
-+ }
-+ SSL_TRACE(("SSL: logging SSL/TLS secrets to %s", ev));
- }
-- SSL_TRACE(("SSL: logging SSL/TLS secrets to %s", ev));
- }
- #ifndef NO_PKCS11_BYPASS
- ev = getenv("SSLBYPASS");

Powered by Google App Engine
This is Rietveld 408576698