OLD | NEW |
1 diff --git a/nss/lib/ssl/ssl3ext.c b/nss/lib/ssl/ssl3ext.c | 1 diff --git a/ssl/ssl3ext.c b/ssl/ssl3ext.c |
2 index 6f3fe2f..523e49a 100644 | 2 index 6c120ff..697a313 100644 |
3 --- a/nss/lib/ssl/ssl3ext.c | 3 --- a/ssl/ssl3ext.c |
4 +++ b/nss/lib/ssl/ssl3ext.c | 4 +++ b/ssl/ssl3ext.c |
5 @@ -295,9 +295,12 @@ ssl3HelloExtensionSender clientHelloSendersTLS[SSL_MAX_EXTE
NSIONS] = { | 5 @@ -308,6 +308,10 @@ ssl3HelloExtensionSender clientHelloSendersTLS[SSL_MAX_EXTE
NSIONS] = { |
6 { ssl_use_srtp_xtn, &ssl3_SendUseSRTPXtn }, | |
7 { ssl_channel_id_xtn, &ssl3_ClientSendChannelIDXtn }, | |
8 { ssl_cert_status_xtn, &ssl3_ClientSendStatusRequestXtn }, | 6 { ssl_cert_status_xtn, &ssl3_ClientSendStatusRequestXtn }, |
9 - { ssl_signature_algorithms_xtn, &ssl3_ClientSendSigAlgsXtn }, | |
10 { ssl_signed_certificate_timestamp_xtn, | 7 { ssl_signed_certificate_timestamp_xtn, |
11 - &ssl3_ClientSendSignedCertTimestampXtn } | 8 &ssl3_ClientSendSignedCertTimestampXtn }, |
12 + &ssl3_ClientSendSignedCertTimestampXtn }, | |
13 + /* WebSphere Application Server 7.0 is intolerant to the last extension | 9 + /* WebSphere Application Server 7.0 is intolerant to the last extension |
14 + * being zero-length. It is not intolerant of TLS 1.2, so move | 10 + * being zero-length. It is not intolerant of TLS 1.2, so ensure that |
15 + * signature_algorithms to the end. */ | 11 + * signature_algorithms is at the end to guarantee a non-empty |
16 + { ssl_signature_algorithms_xtn, &ssl3_ClientSendSigAlgsXtn } | 12 + * extension. */ |
| 13 { ssl_signature_algorithms_xtn, &ssl3_ClientSendSigAlgsXtn }, |
| 14 { ssl_tls13_draft_version_xtn, &ssl3_ClientSendDraftVersionXtn }, |
17 /* any extra entries will appear as { 0, NULL } */ | 15 /* any extra entries will appear as { 0, NULL } */ |
18 }; | 16 @@ -2464,9 +2468,11 @@ ssl3_CalculatePaddingExtensionLength(unsigned int clientH
elloLength) |
19 | |
20 @@ -2347,9 +2350,11 @@ ssl3_CalculatePaddingExtensionLength(unsigned int clientH
elloLength) | |
21 } | 17 } |
22 | 18 |
23 extensionLength = 512 - recordLength; | 19 extensionLength = 512 - recordLength; |
24 - /* Extensions take at least four bytes to encode. */ | 20 - /* Extensions take at least four bytes to encode. */ |
25 - if (extensionLength < 4) { | 21 - if (extensionLength < 4) { |
26 -» extensionLength = 4; | 22 - extensionLength = 4; |
27 + /* Extensions take at least four bytes to encode. Always include at least | 23 + /* Extensions take at least four bytes to encode. Always include at least |
28 + * one byte of data if including the extension. WebSphere Application Serve
r | 24 + * one byte of data if including the extension. WebSphere Application |
29 + * 7.0 is intolerant to the last extension being zero-length. */ | 25 + * Server 7.0 is intolerant to the last extension being zero-length. */ |
30 + if (extensionLength < 4 + 1) { | 26 + if (extensionLength < 4 + 1) { |
31 +» extensionLength = 4 + 1; | 27 + extensionLength = 4 + 1; |
32 } | 28 } |
33 | 29 |
34 return extensionLength; | 30 return extensionLength; |
OLD | NEW |