Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(812)

Side by Side Diff: net/third_party/nss/patches/paddingextension.patch

Issue 99253006: Fill the TLS padding extension with zero bytes instead of spaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | net/third_party/nss/ssl/ssl3ext.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c 1 diff --git a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c
2 index 8b8b758..882e356 100644 2 index 8b8b758..882e356 100644
3 --- a/nss/lib/ssl/ssl3con.c 3 --- a/nss/lib/ssl/ssl3con.c
4 +++ b/nss/lib/ssl/ssl3con.c 4 +++ b/nss/lib/ssl/ssl3con.c
5 @@ -4975,6 +4975,7 @@ ssl3_SendClientHello(sslSocket *ss, PRBool resending) 5 @@ -4975,6 +4975,7 @@ ssl3_SendClientHello(sslSocket *ss, PRBool resending)
6 PRBool isTLS = PR_FALSE; 6 PRBool isTLS = PR_FALSE;
7 PRBool requestingResume = PR_FALSE; 7 PRBool requestingResume = PR_FALSE;
8 PRInt32 total_exten_len = 0; 8 PRInt32 total_exten_len = 0;
9 + unsigned paddingExtensionLen; 9 + unsigned paddingExtensionLen;
10 unsigned numCompressionMethods; 10 unsigned numCompressionMethods;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 + extensionLen > maxBytes || 93 + extensionLen > maxBytes ||
94 + paddingLen > sizeof(padding)) { 94 + paddingLen > sizeof(padding)) {
95 + PORT_Assert(0); 95 + PORT_Assert(0);
96 + return -1; 96 + return -1;
97 + } 97 + }
98 + 98 +
99 + if (SECSuccess != ssl3_AppendHandshakeNumber(ss, ssl_padding_xtn, 2)) 99 + if (SECSuccess != ssl3_AppendHandshakeNumber(ss, ssl_padding_xtn, 2))
100 + return -1; 100 + return -1;
101 + if (SECSuccess != ssl3_AppendHandshakeNumber(ss, paddingLen, 2)) 101 + if (SECSuccess != ssl3_AppendHandshakeNumber(ss, paddingLen, 2))
102 + return -1; 102 + return -1;
103 + memset(padding, ' ', paddingLen); 103 + memset(padding, 0, paddingLen);
104 + if (SECSuccess != ssl3_AppendHandshake(ss, padding, paddingLen)) 104 + if (SECSuccess != ssl3_AppendHandshake(ss, padding, paddingLen))
105 + return -1; 105 + return -1;
106 + 106 +
107 + return extensionLen; 107 + return extensionLen;
108 +} 108 +}
109 diff --git a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h 109 diff --git a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h
110 index 614eed1..9c789bf 100644 110 index 614eed1..9c789bf 100644
111 --- a/nss/lib/ssl/sslimpl.h 111 --- a/nss/lib/ssl/sslimpl.h
112 +++ b/nss/lib/ssl/sslimpl.h 112 +++ b/nss/lib/ssl/sslimpl.h
113 @@ -237,6 +237,13 @@ extern PRInt32 113 @@ -237,6 +237,13 @@ extern PRInt32
(...skipping 19 matching lines...) Expand all
133 ssl_next_proto_nego_xtn = 13172, 133 ssl_next_proto_nego_xtn = 13172,
134 ssl_channel_id_xtn = 30031, 134 ssl_channel_id_xtn = 30031,
135 + ssl_padding_xtn = 35655, 135 + ssl_padding_xtn = 35655,
136 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */ 136 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */
137 } SSLExtensionType; 137 } SSLExtensionType;
138 138
139 -#define SSL_MAX_EXTENSIONS 11 139 -#define SSL_MAX_EXTENSIONS 11
140 +#define SSL_MAX_EXTENSIONS 11 /* doesn't include ssl_padding_xtn. * / 140 +#define SSL_MAX_EXTENSIONS 11 /* doesn't include ssl_padding_xtn. * /
141 141
142 #endif /* __sslt_h_ */ 142 #endif /* __sslt_h_ */
OLDNEW
« no previous file with comments | « no previous file | net/third_party/nss/ssl/ssl3ext.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698