summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Thomson <martin.thomson@gmail.com>2015-02-01 19:07:50 -0800
committerMartin Thomson <martin.thomson@gmail.com>2015-02-01 19:07:50 -0800
commit77c2f1e8d0b827f3580dcc1cb7eabcde6a7175f2 (patch)
tree20f38546b9e081b96ff1023cedb789d9f5ee6f50
parente1df3444746142ce276ef30481f05a51a9f5f82b (diff)
downloadnss-hg-77c2f1e8d0b827f3580dcc1cb7eabcde6a7175f2.tar.gz
Bug 753136 - Fix ssl3_ClientHandleSessionTicketXtn. If the extension
contains data, return SECSuccess to ignore the extension. r=wtc.
-rw-r--r--lib/ssl/ssl3ext.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/ssl3ext.c b/lib/ssl/ssl3ext.c
index 822dfa8c6..36608669d 100644
--- a/lib/ssl/ssl3ext.c
+++ b/lib/ssl/ssl3ext.c
@@ -1366,8 +1366,9 @@ SECStatus
ssl3_ClientHandleSessionTicketXtn(sslSocket *ss, PRUint16 ex_type,
SECItem *data)
{
- if (data->len != 0)
- return SECFailure;
+ if (data->len != 0) {
+ return SECSuccess; /* Ignore the extension. */
+ }
/* Keep track of negotiated extensions. */
ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type;