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

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

Issue 62103003: NSS: add `balloon' extension to when we might hit the F5 bug. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing wtc's comments. Created 7 years, 1 month 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
OLDNEW
(Empty)
1 diff --git a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c
2 index 8b8b758..e9118bf 100644
3 --- a/nss/lib/ssl/ssl3con.c
4 +++ b/nss/lib/ssl/ssl3con.c
5 @@ -4975,6 +4975,7 @@ ssl3_SendClientHello(sslSocket *ss, PRBool resending)
6 PRBool isTLS = PR_FALSE;
7 PRBool requestingResume = PR_FALSE;
8 PRInt32 total_exten_len = 0;
9 + unsigned paddingExtensionLen;
10 unsigned numCompressionMethods;
11 PRInt32 flags;
12
13 @@ -5241,6 +5242,19 @@ ssl3_SendClientHello(sslSocket *ss, PRBool resending)
14 length += 1 + ss->ssl3.hs.cookieLen;
15 }
16
17 + /* A padding extension may be included to ensure that the record containing
18 + * the ClientHello doesn't have a length between 256 and 511 bytes
19 + * (inclusive). Records with such lengths trigger bugs in F5 devices.
20 + *
21 + * This is not done for DTLS nor for renegotiation. */
22 + if (!IS_DTLS(ss) && !ss->firstHsDone) {
23 + paddingExtensionLen = ssl3_CalculatePaddingExtensionLength(length);
24 + } else {
25 + paddingExtensionLen = 0;
26 + }
27 + total_exten_len += paddingExtensionLen;
28 + length += paddingExtensionLen;
29 +
30 rv = ssl3_AppendHandshakeHeader(ss, client_hello, length);
31 if (rv != SECSuccess) {
32 return rv; /* err set by ssl3_AppendHandshake* */
33 @@ -5360,6 +5374,13 @@ ssl3_SendClientHello(sslSocket *ss, PRBool resending)
34 return SECFailure;
35 }
36 maxBytes -= extLen;
37 +
38 + extLen = ssl3_AppendPaddingExtension(ss, paddingExtensionLen, maxBytes);
39 + if (extLen < 0) {
40 + return SECFailure;
41 + }
42 + maxBytes -= extLen;
43 +
44 PORT_Assert(!maxBytes);
45 }
46 if (ss->ssl3.hs.sendingSCSV) {
47 diff --git a/nss/lib/ssl/ssl3ext.c b/nss/lib/ssl/ssl3ext.c
48 index 0415770..4fe9533 100644
49 --- a/nss/lib/ssl/ssl3ext.c
50 +++ b/nss/lib/ssl/ssl3ext.c
51 @@ -2297,3 +2297,57 @@ ssl3_ClientSendSigAlgsXtn(sslSocket * ss, PRBool append, PRUint32 maxBytes)
52 loser:
53 return -1;
54 }
55 +
56 +unsigned int
57 +ssl3_CalculatePaddingExtensionLength(unsigned int clientHelloLength)
58 +{
59 + unsigned int recordLength = 1 /* handshake message type */ +
60 + 3 /* handshake message length */ +
61 + clientHelloLength;
62 + unsigned int extensionLength;
63 +
64 + if (recordLength < 256 || recordLength >= 512) {
65 + return 0;
66 + }
67 +
68 + extensionLength = 512 - recordLength;
69 + /* Extensions take at least four bytes to encode. */
70 + if (extensionLength < 4) {
71 + extensionLength = 4;
72 + }
73 +
74 + return extensionLength;
75 +}
76 +
77 +/* ssl3_AppendPaddingExtension possibly adds an extension which ensures that a
78 + * ClientHello record is either < 256 bytes or is >= 512 bytes. This ensures
79 + * that we don't trigger bugs in F5 products. */
80 +unsigned int
81 +ssl3_AppendPaddingExtension(sslSocket *ss, unsigned int extensionLen,
82 + PRUint32 maxBytes)
83 +{
84 + SECStatus rv;
85 + unsigned int paddingLen = extensionLen - 4;
86 + unsigned char padding[256];
87 +
88 + if (extensionLen == 0) {
89 + return 0;
90 + }
91 +
92 + if (extensionLen < 4 ||
93 + extensionLen > maxBytes ||
94 + paddingLen > sizeof(padding)) {
95 + PORT_Assert(0);
96 + return 0;
97 + }
98 +
99 + if (SECSuccess != ssl3_AppendHandshakeNumber(ss, ssl_padding_xtn, 2))
100 + return -1;
101 + if (SECSuccess != ssl3_AppendHandshakeNumber(ss, paddingLen, 2))
102 + return -1;
103 + memset(padding, ' ', paddingLen);
104 + if (SECSuccess != ssl3_AppendHandshake(ss, padding, paddingLen))
105 + return -1;
106 +
107 + return extensionLen;
108 +}
109 diff --git a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h
110 index 614eed1..621f25e 100644
111 --- a/nss/lib/ssl/sslimpl.h
112 +++ b/nss/lib/ssl/sslimpl.h
113 @@ -237,6 +237,13 @@ extern PRInt32
114 ssl3_CallHelloExtensionSenders(sslSocket *ss, PRBool append, PRUint32 maxBytes,
115 const ssl3HelloExtensionSender *sender);
116
117 +extern unsigned int
118 +ssl3_CalculatePaddingExtensionLength(unsigned int clientHelloLength);
119 +
120 +extern unsigned int
121 +ssl3_AppendPaddingExtension(sslSocket *ss, unsigned int extensionLen,
122 + PRUint32 maxBytes);
123 +
124 /* Socket ops */
125 struct sslSocketOpsStr {
126 int (*connect) (sslSocket *, const PRNetAddr *);
127 diff --git a/nss/lib/ssl/sslt.h b/nss/lib/ssl/sslt.h
128 index a8007d8..e4d188f 100644
129 --- a/nss/lib/ssl/sslt.h
130 +++ b/nss/lib/ssl/sslt.h
131 @@ -205,9 +205,10 @@ typedef enum {
132 ssl_session_ticket_xtn = 35,
133 ssl_next_proto_nego_xtn = 13172,
134 ssl_channel_id_xtn = 30031,
135 + ssl_padding_xtn = 35655,
136 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */
137 } SSLExtensionType;
138
139 -#define SSL_MAX_EXTENSIONS 11
140 +#define SSL_MAX_EXTENSIONS 11 /* doesn't include ssl_padding_xtn. * /
141
142 #endif /* __sslt_h_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698