| Index: net/third_party/nss/patches/reorderextensions.patch
|
| diff --git a/net/third_party/nss/patches/reorderextensions.patch b/net/third_party/nss/patches/reorderextensions.patch
|
| deleted file mode 100644
|
| index 0779e6971ac06ea27375858ed900c1c9ea5aa0c4..0000000000000000000000000000000000000000
|
| --- a/net/third_party/nss/patches/reorderextensions.patch
|
| +++ /dev/null
|
| @@ -1,35 +0,0 @@
|
| -diff --git a/lib/ssl/ssl3ext.c b/lib/ssl/ssl3ext.c
|
| -index 2ffe77b..3b48c9e 100644
|
| ---- a/lib/ssl/ssl3ext.c
|
| -+++ b/lib/ssl/ssl3ext.c
|
| -@@ -336,10 +336,14 @@ static const ssl3HelloExtensionSender clientHelloSendersTLS[SSL_MAX_EXTENSIONS]
|
| - { ssl_use_srtp_xtn, &ssl3_ClientSendUseSRTPXtn },
|
| - { ssl_channel_id_xtn, &ssl3_ClientSendChannelIDXtn },
|
| - { ssl_cert_status_xtn, &ssl3_ClientSendStatusRequestXtn },
|
| -- { ssl_signature_algorithms_xtn, &ssl3_ClientSendSigAlgsXtn },
|
| - { ssl_tls13_draft_version_xtn, &ssl3_ClientSendDraftVersionXtn },
|
| - { ssl_signed_cert_timestamp_xtn, &ssl3_ClientSendSignedCertTimestampXtn },
|
| - { ssl_tls13_key_share_xtn, &tls13_ClientSendKeyShareXtn },
|
| -+ /* Some servers (e.g. WebSphere Application Server 7.0 and Tomcat) will
|
| -+ * time out or terminate the connection if the last extension in the
|
| -+ * client hello is empty. They are not intolerant of TLS 1.2, so list
|
| -+ * signature_algorithms at the end. See bug 1243641. */
|
| -+ { ssl_signature_algorithms_xtn, &ssl3_ClientSendSigAlgsXtn },
|
| - /* any extra entries will appear as { 0, NULL } */
|
| - };
|
| -
|
| -@@ -2690,9 +2694,11 @@ ssl3_CalculatePaddingExtensionLength(unsigned int clientHelloLength)
|
| - }
|
| -
|
| - extensionLength = 512 - recordLength;
|
| -- /* Extensions take at least four bytes to encode. */
|
| -- if (extensionLength < 4) {
|
| -- extensionLength = 4;
|
| -+ /* Extensions take at least four bytes to encode. Always include at least
|
| -+ * one byte of data if including the extension. WebSphere Application
|
| -+ * Server 7.0 is intolerant to the last extension being zero-length. */
|
| -+ if (extensionLength < 4 + 1) {
|
| -+ extensionLength = 4 + 1;
|
| - }
|
| -
|
| - return extensionLength;
|
|
|