From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 4 Jun 2011 19:44:55 +0000 (+0200)
Subject: store the ECC curve in the session resumption parameters.
X-Git-Tag: gnutls_2_99_3~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=088ba12d2eb317227e6384157edcc1aa1e7c3e4b;p=thirdparty%2Fgnutls.git

store the ECC curve in the session resumption parameters.
---

diff --git a/lib/gnutls_session_pack.c b/lib/gnutls_session_pack.c
index c39cfbd064..55ce8dbc2c 100644
--- a/lib/gnutls_session_pack.c
+++ b/lib/gnutls_session_pack.c
@@ -732,8 +732,9 @@ error:
  *      x bytes the session ID (32 bytes max)
  *
  *      4 bytes a timestamp
+ *      4 bytes the ECC curve
  *            -------------------
- *                MAX: 165 bytes
+ *                MAX: 169 bytes
  *
  */
 static int
@@ -792,6 +793,7 @@ 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);
   BUFFER_APPEND_NUM (ps, session->security_parameters.timestamp);
+  BUFFER_APPEND_NUM (ps, session->security_parameters.ecc_curve);
 
   _gnutls_write_uint32 (ps->length - cur_size, ps->data + size_offset);
 
@@ -852,6 +854,9 @@ unpack_security_parameters (gnutls_session_t session, gnutls_buffer_st * ps)
   BUFFER_POP_NUM (ps,
                   session->internals.resumed_security_parameters.timestamp);
 
+  BUFFER_POP_NUM (ps,
+                  session->internals.resumed_security_parameters.ecc_curve);
+
   if (timestamp - session->internals.resumed_security_parameters.timestamp >
       session->internals.expire_time
       || session->internals.resumed_security_parameters.timestamp > timestamp)