From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 27 Jun 2010 19:04:34 +0000 (+0200)
Subject: Corrected writing and reading order of security parameters.
X-Git-Tag: gnutls_2_11_3~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c3922fb51cef20db97d0b86eff5a05d63af43b0;p=thirdparty%2Fgnutls.git

Corrected writing and reading order of security parameters.
---

diff --git a/lib/gnutls_session_pack.c b/lib/gnutls_session_pack.c
index 6ad507f8d7..70de27d410 100644
--- a/lib/gnutls_session_pack.c
+++ b/lib/gnutls_session_pack.c
@@ -764,11 +764,12 @@ pack_security_parameters (gnutls_session_t session,
   BUFFER_APPEND(ps, session->security_parameters.master_secret, GNUTLS_MASTER_SIZE);
   BUFFER_APPEND(ps, session->security_parameters.client_random, GNUTLS_RANDOM_SIZE);
   BUFFER_APPEND(ps, session->security_parameters.server_random, GNUTLS_RANDOM_SIZE);
+
   BUFFER_APPEND_NUM(ps, session->security_parameters.session_id_size);
-  BUFFER_APPEND_NUM(ps, session->security_parameters.max_record_send_size);
-  BUFFER_APPEND_NUM(ps, session->security_parameters.max_record_recv_size);
   BUFFER_APPEND(ps, session->security_parameters.session_id, session->security_parameters.session_id_size);
 
+  BUFFER_APPEND_NUM(ps, session->security_parameters.max_record_send_size);
+  BUFFER_APPEND_NUM(ps, session->security_parameters.max_record_recv_size);
   BUFFER_APPEND_NUM(ps, session->security_parameters.timestamp);
 
   _gnutls_write_uint32(ps->length-cur_size, ps->data+size_offset);
@@ -818,9 +819,9 @@ unpack_security_parameters (gnutls_session_t session,
   BUFFER_POP(ps, &session->internals.resumed_security_parameters.session_id,
 	  session->internals.resumed_security_parameters.session_id_size);
 
-  BUFFER_POP_NUM(ps, session->internals.resumed_security_parameters.timestamp);
   BUFFER_POP_NUM(ps, session->internals.resumed_security_parameters.max_record_send_size);
   BUFFER_POP_NUM(ps, session->internals.resumed_security_parameters.max_record_recv_size);
+  BUFFER_POP_NUM(ps, session->internals.resumed_security_parameters.timestamp);
 
   if (timestamp - session->internals.resumed_security_parameters.timestamp >
       session->internals.expire_time