Imported Upstream version 5.0.1

1 files changed, 17 insertions, 16 deletions

diff --git a/src/libtls/tls_fragmentation.c b/src/libtls/tls_fragmentation.c
index 62e36aaec..f2fa77cfd 100644
--- a/src/libtls/tls_fragmentation.c
+++ b/src/libtls/tls_fragmentation.c
@@ -18,6 +18,11 @@
 #include <bio/bio_reader.h>
 #include <debug.h>
 
+/**
+ * Maximum size of a TLS handshake message we accept
+ */
+#define TLS_MAX_HANDSHAKE_LEN	65536
+
 typedef struct private_tls_fragmentation_t private_tls_fragmentation_t;
 
 /**
@@ -94,16 +99,6 @@ struct private_tls_fragmentation_t {
 };
 
 /**
- * Maximum size of a TLS fragment
- */
-#define MAX_TLS_FRAGMENT_LEN 16384
-
-/**
- * Maximum size of a TLS handshake message we accept
- */
-#define MAX_TLS_HANDSHAKE_LEN 65536
-
-/**
  * Process a TLS alert
  */
 static status_t process_alert(private_tls_fragmentation_t *this,
@@ -134,7 +129,7 @@ static status_t process_handshake(private_tls_fragmentation_t *this,
 		status_t status;
 		chunk_t data;
 
-		if (reader->remaining(reader) > MAX_TLS_FRAGMENT_LEN)
+		if (reader->remaining(reader) > TLS_MAX_FRAGMENT_LEN)
 		{
 			DBG1(DBG_TLS, "TLS fragment has invalid length");
 			this->alert->add(this->alert, TLS_FATAL, TLS_DECODE_ERROR);
@@ -151,7 +146,7 @@ static status_t process_handshake(private_tls_fragmentation_t *this,
 				return NEED_MORE;
 			}
 			this->type = type;
-			if (len > MAX_TLS_HANDSHAKE_LEN)
+			if (len > TLS_MAX_HANDSHAKE_LEN)
 			{
 				DBG1(DBG_TLS, "TLS handshake exceeds maximum length");
 				this->alert->add(this->alert, TLS_FATAL, TLS_DECODE_ERROR);
@@ -202,12 +197,18 @@ static status_t process_handshake(private_tls_fragmentation_t *this,
 static status_t process_application(private_tls_fragmentation_t *this,
 									bio_reader_t *reader)
 {
+	if (!this->handshake->finished(this->handshake))
+	{
+		DBG1(DBG_TLS, "received TLS application data, "
+			 "but handshake not finished");
+		return FAILED;
+	}
 	while (reader->remaining(reader))
 	{
 		status_t status;
 		chunk_t data;
 
-		if (reader->remaining(reader) > MAX_TLS_FRAGMENT_LEN)
+		if (reader->remaining(reader) > TLS_MAX_FRAGMENT_LEN)
 		{
 			DBG1(DBG_TLS, "TLS fragment has invalid length");
 			this->alert->add(this->alert, TLS_FATAL, TLS_DECODE_ERROR);
@@ -427,14 +428,14 @@ METHOD(tls_fragmentation_t, build, status_t,
 	if (this->output.len)
 	{
 		*type = this->output_type;
-		if (this->output.len <= MAX_TLS_FRAGMENT_LEN)
+		if (this->output.len <= TLS_MAX_FRAGMENT_LEN)
 		{
 			*data = this->output;
 			this->output = chunk_empty;
 			return NEED_MORE;
 		}
-		*data = chunk_create(this->output.ptr, MAX_TLS_FRAGMENT_LEN);
-		this->output = chunk_clone(chunk_skip(this->output, MAX_TLS_FRAGMENT_LEN));
+		*data = chunk_create(this->output.ptr, TLS_MAX_FRAGMENT_LEN);
+		this->output = chunk_clone(chunk_skip(this->output, TLS_MAX_FRAGMENT_LEN));
 		return NEED_MORE;
 	}
 	return status;