summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWan-Teh Chang <wtc@google.com>2013-08-21 18:57:20 -0700
committerWan-Teh Chang <wtc@google.com>2013-08-21 18:57:20 -0700
commite5764c1a4b910c0eb4c83adba1de89b9b221bfc1 (patch)
treed184ba7d37a90df7c8da0fc25dbd39f9f30dac0c
parent99628a5100a92bb45a80112cf49a17596b6f5c17 (diff)
downloadnss-hg-e5764c1a4b910c0eb4c83adba1de89b9b221bfc1.tar.gz
Bug 734007: sizeof(SSL3_MASTER_SECRET_LENGTH) was incorrectly used inNSS_3_15_2_BETA1
ssl3_ServerHandleSessionTicketXtn. r=sleevi.
-rw-r--r--lib/ssl/ssl3ext.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/ssl3ext.c b/lib/ssl/ssl3ext.c
index f6e9e2b78..616ca4c6f 100644
--- a/lib/ssl/ssl3ext.c
+++ b/lib/ssl/ssl3ext.c
@@ -1411,7 +1411,7 @@ ssl3_ServerHandleSessionTicketXtn(sslSocket *ss, PRUint16 ex_type,
goto no_ticket;
/* Allow for the wrapped master secret to be longer. */
- if (buffer_len < sizeof(SSL3_MASTER_SECRET_LENGTH))
+ if (buffer_len < parsed_session_ticket->ms_length)
goto no_ticket;
PORT_Memcpy(parsed_session_ticket->master_secret, buffer,
parsed_session_ticket->ms_length);