summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWan-Teh Chang <wtc@google.com>2015-05-29 09:59:13 -0700
committerWan-Teh Chang <wtc@google.com>2015-05-29 09:59:13 -0700
commit31407e8c60aa57f08bb4c00ca8cf98898eb634d1 (patch)
tree9903df572a3dc127ff55eb2597b23e1ca0d1ac48
parent9e38c5b3040e28713d643be524c78027bc128af9 (diff)
downloadnss-hg-31407e8c60aa57f08bb4c00ca8cf98898eb634d1.tar.gz
Bug 1169451: Report SSL_ERROR_RX_MALFORMED_HANDSHAKE if a handshake
message is too long. r=mt,rbarnes.
-rw-r--r--lib/ssl/dtlscon.c2
-rw-r--r--lib/ssl/ssl3con.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/dtlscon.c b/lib/ssl/dtlscon.c
index 89315eee0..cb63b2cc0 100644
--- a/lib/ssl/dtlscon.c
+++ b/lib/ssl/dtlscon.c
@@ -229,7 +229,7 @@ dtls_HandleHandshake(sslSocket *ss, sslBuffer *origBuf)
#define MAX_HANDSHAKE_MSG_LEN 0x1ffff /* 128k - 1 */
if (message_length > MAX_HANDSHAKE_MSG_LEN) {
(void)ssl3_DecodeError(ss);
- PORT_SetError(SSL_ERROR_RX_RECORD_TOO_LONG);
+ PORT_SetError(SSL_ERROR_RX_MALFORMED_HANDSHAKE);
return SECFailure;
}
#undef MAX_HANDSHAKE_MSG_LEN
diff --git a/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c
index 6a168099c..22b30adac 100644
--- a/lib/ssl/ssl3con.c
+++ b/lib/ssl/ssl3con.c
@@ -10998,7 +10998,7 @@ ssl3_HandleHandshake(sslSocket *ss, sslBuffer *origBuf)
#define MAX_HANDSHAKE_MSG_LEN 0x1ffff /* 128k - 1 */
if (ss->ssl3.hs.msg_len > MAX_HANDSHAKE_MSG_LEN) {
(void)ssl3_DecodeError(ss);
- PORT_SetError(SSL_ERROR_RX_RECORD_TOO_LONG);
+ PORT_SetError(SSL_ERROR_RX_MALFORMED_HANDSHAKE);
return SECFailure;
}
#undef MAX_HANDSHAKE_MSG_LEN