net/third_party/nss/ssl/derive.c - Issue 1511123006: Uprev NSS (in libssl) to NSS 3.21

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/derive.c

Issue 1511123006: Uprev NSS (in libssl) to NSS 3.21 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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/derive.c

diff --git a/net/third_party/nss/ssl/derive.c b/net/third_party/nss/ssl/derive.c

index b7c38c30ba32cd7f226c7eee0184f4becf2c59c8..8b58b800d713c2f338759e9a90bc0517bfca9b58 100644

--- a/net/third_party/nss/ssl/derive.c

+++ b/net/third_party/nss/ssl/derive.c

@@ -431,7 +431,7 @@ key_and_mac_derive_fail:

* so isRSA is always true.

SECStatus

-ssl3_MasterKeyDeriveBypass(

+ssl3_MasterSecretDeriveBypass(

ssl3CipherSpec * pwSpec,

const unsigned char * cr,

const unsigned char * sr,