net/third_party/nss/patches/getchannelinfo.patch - Issue 10777021: Cap the record layer version number of TLS ClientHello to TLS 1.0

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

Issue 10777021: Cap the record layer version number of TLS ClientHello to TLS 1.0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Make the changes rsleevi suggested. Add the patch file. 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:

View unified diff | Download patch | Annotate | Revision Log

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

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

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

3 --- ssl/sslinfo.c» (revision 142907)	3 --- net/third_party/nss/ssl/sslinfo.c» (revision 143014)

4 +++ ssl/sslinfo.c» (working copy)	4 +++ net/third_party/nss/ssl/sslinfo.c» (revision 143015)

5 @@ -97,11 +97,11 @@	5 @@ -97,11 +97,11 @@

6 } else if (ss->ssl3.initialized) { /* SSL3 and TLS */	6 } else if (ss->ssl3.initialized) { /* SSL3 and TLS */

7 ssl_GetSpecReadLock(ss);	7 ssl_GetSpecReadLock(ss);

8 /* XXX The cipher suite should be in the specs and this	8 /* XXX The cipher suite should be in the specs and this

9 - * function should get it from crSpec rather than from the "hs".	9 - * function should get it from crSpec rather than from the "hs".

10 + * function should get it from cwSpec rather than from the "hs".	10 + * function should get it from cwSpec rather than from the "hs".

11 * See bug 275744 comment 69.	11 * See bug 275744 comment 69.

12 */	12 */

13 inf.cipherSuite = ss->ssl3.hs.cipher_suite;	13 inf.cipherSuite = ss->ssl3.hs.cipher_suite;

14 - inf.compressionMethod = ss->ssl3.crSpec->compression_method;	14 - inf.compressionMethod = ss->ssl3.crSpec->compression_method;

15 + inf.compressionMethod = ss->ssl3.cwSpec->compression_method;	15 + inf.compressionMethod = ss->ssl3.cwSpec->compression_method;

16 ssl_ReleaseSpecReadLock(ss);	16 ssl_ReleaseSpecReadLock(ss);

17 inf.compressionMethodName =	17 inf.compressionMethodName =

18 ssl_GetCompressionMethodName(inf.compressionMethod);	18 ssl_GetCompressionMethodName(inf.compressionMethod);

19 @@ -336,7 +336,7 @@	19 @@ -336,7 +336,7 @@

20 ss->ssl3.initialized) { /* TLS */	20 ss->ssl3.initialized) { /* TLS */

21 SECItem *crsName;	21 SECItem *crsName;

22 ssl_GetSpecReadLock(ss); /*********************************/	22 ssl_GetSpecReadLock(ss); /*********************************/

23 - crsName = &ss->ssl3.crSpec->srvVirtName;	23 - crsName = &ss->ssl3.crSpec->srvVirtName;

24 + crsName = &ss->ssl3.cwSpec->srvVirtName;	24 + crsName = &ss->ssl3.cwSpec->srvVirtName;

25 if (crsName->data) {	25 if (crsName->data) {

26 sniName = SECITEM_DupItem(crsName);	26 sniName = SECITEM_DupItem(crsName);

27 }	27 }

OLD	NEW