net/third_party/nss/ssl/sslcon.c - Issue 111853013: Update net/third_party/nss to NSS 3.15.4.

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

Unified Diff: net/third_party/nss/ssl/sslcon.c

Issue 111853013: Update net/third_party/nss to NSS 3.15.4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Update the comment in sslenum.c for the two CHACHA20 cipher suites Created 6 years, 11 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:

Index: net/third_party/nss/ssl/sslcon.c

===================================================================

--- net/third_party/nss/ssl/sslcon.c (revision 242942)

+++ net/third_party/nss/ssl/sslcon.c (working copy)

@@ -20,7 +20,6 @@

#include "prinit.h"

#include "prtime.h" /* for PR_Now() */

-#define XXX

static PRBool policyWasSet;

/* This ordered list is indexed by (SSL_CK_xx * 3) */

@@ -628,8 +627,9 @@

(*ss->sec.uncache)(sid);

rv = (SECStatus)sent;

} else if (!ss->opt.noCache) {

- /* Put the sid in session-id cache, (may already be there) */

- (*ss->sec.cache)(sid);

+ if (sid->cached == never_cached) {

+ (*ss->sec.cache)(sid);

+ }

rv = SECSuccess;

}

ssl_FreeSID(sid);

@@ -2171,7 +2171,7 @@

sid->peerCert = CERT_DupCertificate(ss->sec.peerCert);

}

- if (!ss->opt.noCache)

+ if (!ss->opt.noCache && sid->cached == never_cached)

(*ss->sec.cache)(sid);

}

« no previous file with comments | « net/third_party/nss/ssl/sslauth.c ('k') | net/third_party/nss/ssl/sslenum.c » ('j') | no next file with comments »