net/third_party/nss/patches/sslkeylogerror.patch - Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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, 7 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:

OLD	NEW
	(Empty)
1 diff -pu -r a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsoc k.c

2 --- a/net/third_party/nss/ssl/sslsock.c 2012-11-09 16:16:23.715038258 -0800

3 +++ b/net/third_party/nss/ssl/sslsock.c 2012-11-09 16:19:18.517565894 -0800

4 @@ -2906,11 +2906,15 @@ ssl_SetDefaultsFromEnvironment(void)

5 ev = getenv("SSLKEYLOGFILE");

6 if (ev && ev[0]) {

7 ssl_keylog_iob = fopen(ev, "a");

8 - if (ftell(ssl_keylog_iob) == 0) {

9 - fputs("# SSL/TLS secrets log file, generated by NSS\n",

10 - ssl_keylog_iob);

11 + if (!ssl_keylog_iob) {

12 + SSL_TRACE(("Failed to open key log file"));

13 + } else {

14 + if (ftell(ssl_keylog_iob) == 0) {

15 + fputs("# SSL/TLS secrets log file, generated by NSS\n",

16 + ssl_keylog_iob);

17 + }

18 + SSL_TRACE(("SSL: logging SSL/TLS secrets to %s", ev));

19 }

20 - SSL_TRACE(("SSL: logging SSL/TLS secrets to %s", ev));

21 }

22 #ifndef NO_PKCS11_BYPASS

23 ev = getenv("SSLBYPASS");

OLD	NEW