net/third_party/nss/patches/sslkeylogerror.patch - Issue 10636062: Fix crash when an SSL key-log file couldn't be opened.

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 10636062: Fix crash when an SSL key-log file couldn't be opened. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: ... Created 8 years, 5 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 --git a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock .c

	2 index 1823a1c..2a93dae 100644

	3 --- a/net/third_party/nss/ssl/sslsock.c

	4 +++ b/net/third_party/nss/ssl/sslsock.c

	5 @@ -2934,11 +2934,15 @@ ssl_SetDefaultsFromEnvironment(void)

	6 ev = getenv("SSLKEYLOGFILE");

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

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

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

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

	11 - ssl_keylog_iob);

	12 + if (!ssl_keylog_iob) {

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

	14 + } else {

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

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

	17 + ssl_keylog_iob);

	18 + }

	19 + SSL_TRACE(("SSL: logging pre-master secrets to %s", ev));

	20 }

	21 - SSL_TRACE(("SSL: logging pre-master secrets to %s", ev));

	22 }

	23 ev = getenv("SSLBYPASS");

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

OLD	NEW

« no previous file with comments | « net/third_party/nss/patches/applypatches.sh ('k') | net/third_party/nss/ssl/sslsock.c » ('j') | no next file with comments »