net/third_party/nss/patches/tls12backuphash.patch - Issue 23880004: Merge 220595 "On Windows, prefer to generate SHA-1 signatures fo..."

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/tls12backuphash.patch

Issue 23880004: Merge 220595 "On Windows, prefer to generate SHA-1 signatures fo..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1599/src/

Patch Set: Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 Index: net/third_party/nss/ssl/ssl3con.c	1 Index: net/third_party/nss/ssl/ssl3con.c

2 ===================================================================	2 ===================================================================

3 --- net/third_party/nss/ssl/ssl3con.c (revision 219342)	3 --- net/third_party/nss/ssl/ssl3con.c (revision 219342)

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

5 @@ -3933,6 +3933,22 @@	5 @@ -3933,6 +3933,22 @@

6 ssl_MapLowLevelError(SSL_ERROR_DIGEST_FAILURE);	6 ssl_MapLowLevelError(SSL_ERROR_DIGEST_FAILURE);

7 return SECFailure;	7 return SECFailure;

8 }	8 }

9 +	9 +

10 +#ifdef _WIN32	10 +#ifdef _WIN32

(...skipping 143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
154 @@ -838,6 +838,9 @@	154 @@ -838,6 +838,9 @@

155 * SSL 3.0 - TLS 1.1 use both \|md5\| and \|sha\|. \|md5\| is used for MD5 and	155 * SSL 3.0 - TLS 1.1 use both \|md5\| and \|sha\|. \|md5\| is used for MD5 and

156 * \|sha\| for SHA-1.	156 * \|sha\| for SHA-1.

157 * TLS 1.2 and later use only \|sha\|, for SHA-256. */	157 * TLS 1.2 and later use only \|sha\|, for SHA-256. */

158 + /* NOTE: On Windows, TLS 1.2 and later use \|md5\| as a backup handshake hash	158 + /* NOTE: On Windows, TLS 1.2 and later use \|md5\| as a backup handshake hash

159 + * for generating client auth signatures. Confusingly, the backup hash	159 + * for generating client auth signatures. Confusingly, the backup hash

160 + * function is SHA-1. */	160 + * function is SHA-1. */

161 PK11Context * md5;	161 PK11Context * md5;

162 PK11Context * sha;	162 PK11Context * sha;

163	163

OLD	NEW

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