From: Daiki Ueno <dueno@redhat.com>
Date: Wed, 30 Jan 2019 09:21:07 +0000 (+0100)
Subject: session_pack: reset max_record_recv_size when packing
X-Git-Tag: gnutls_3_6_7~41^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1d654af712ef0776cb00825dbe8bf4e7e1c71a4;p=thirdparty%2Fgnutls.git

session_pack: reset max_record_recv_size when packing

Signed-off-by: Daiki Ueno <dueno@redhat.com>
---

diff --git a/lib/session_pack.c b/lib/session_pack.c
index eec594e38e..da74f45e0c 100644
--- a/lib/session_pack.c
+++ b/lib/session_pack.c
@@ -923,9 +923,18 @@ pack_security_parameters(gnutls_session_t session, gnutls_buffer_st * ps)
 		BUFFER_APPEND_NUM(ps,
 				  session->security_parameters.
 				  max_record_send_size);
-		BUFFER_APPEND_NUM(ps,
-				  session->security_parameters.
-				  max_record_recv_size);
+
+		/* reset max_record_recv_size if it was negotiated
+		 * using the record_size_limit extension */
+		if (session->internals.hsk_flags & HSK_RECORD_SIZE_LIMIT_NEGOTIATED) {
+			BUFFER_APPEND_NUM(ps,
+					  session->security_parameters.
+					  max_record_send_size);
+		} else {
+			BUFFER_APPEND_NUM(ps,
+					  session->security_parameters.
+					  max_record_recv_size);
+		}
 
 		if (session->security_parameters.grp) {
 			BUFFER_APPEND_NUM(ps, session->security_parameters.grp->id);