Allocate session buffers of size, depending on type of session.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

diff --git a/lib/ext_session_ticket.c b/lib/ext_session_ticket.c
index 25a01a05f9e8ea7e631c16c0a40c6df527da21f2..9c44b90555091352d3f4014bf5e8fe1d9abcd655 100644 (file)
--- a/lib/ext_session_ticket.c
+++ b/lib/ext_session_ticket.c
@@ -648,8 +648,7 @@ _gnutls_send_new_session_ticket (gnutls_session_t session, int again)
       ticket_len = KEY_NAME_SIZE + IV_SIZE + 2 + ticket.encrypted_state_len
         + MAC_SIZE;
 
-      bufel =
-        _gnutls_handshake_alloc (4 + 2 + ticket_len, 4 + 2 + ticket_len);
+      bufel = _gnutls_handshake_alloc (session, 4 + 2 + ticket_len, 4+2+ticket_len);
       if (!bufel)
         {
           gnutls_assert ();

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 84fb9e120c2c4e1ab9d8a9c3a51af2bf88330c97..75751edae5ac03492f338d3d3d173e09d99b0775 100644 (file)
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -672,8 +672,7 @@ _gnutls_send_finished (gnutls_session_t session, int again)
 
   if (again == 0)
     {
-      bufel =
-        _gnutls_handshake_alloc (MAX_VERIFY_DATA_SIZE, MAX_VERIFY_DATA_SIZE);
+      bufel = _gnutls_handshake_alloc (session, MAX_VERIFY_DATA_SIZE, MAX_VERIFY_DATA_SIZE);
       if (bufel == NULL)
         {
           gnutls_assert ();
@@ -1093,7 +1092,7 @@ _gnutls_send_empty_handshake (gnutls_session_t session,
 
   if (again == 0)
     {
-      bufel = _gnutls_handshake_alloc (0, 0);
+      bufel = _gnutls_handshake_alloc (session, 0, 0);
       if (bufel == NULL)
         {
           gnutls_assert ();
@@ -2049,8 +2048,7 @@ _gnutls_send_client_hello (gnutls_session_t session, int again)
       /* 2 for version, (4 for unix time + 28 for random bytes==GNUTLS_RANDOM_SIZE) 
        */
 
-      bufel =
-        _gnutls_handshake_alloc (datalen, datalen + MAX_EXT_DATA_LENGTH);
+      bufel = _gnutls_handshake_alloc (session, datalen, datalen+MAX_EXT_DATA_LENGTH);
       if (bufel == NULL)
         {
           gnutls_assert ();
@@ -2224,8 +2222,7 @@ _gnutls_send_server_hello (gnutls_session_t session, int again)
           goto fail;
         }
 
-      bufel =
-        _gnutls_handshake_alloc (datalen + extdata.length, datalen + extdata.length);
+      bufel = _gnutls_handshake_alloc (session, datalen + extdatalen, datalen + extdatalen);
       if (bufel == NULL)
         {
           gnutls_assert ();
@@ -2541,7 +2538,7 @@ _gnutls_send_supplemental (gnutls_session_t session, int again)
           return ret;
         }
 
-      bufel = _gnutls_handshake_alloc (buf.length, buf.length);
+      bufel = _gnutls_handshake_alloc(session, buf.length, buf.length);
       if (bufel == NULL)
         {
           gnutls_assert ();

diff --git a/lib/gnutls_kx.c b/lib/gnutls_kx.c
index 24e0b831401d52588420796983c92cd2ce641c25..d105c166a7e4ee061dd49d67692731ada5c1b45e 100644 (file)
--- a/lib/gnutls_kx.c
+++ b/lib/gnutls_kx.c
@@ -58,7 +58,7 @@ send_handshake (gnutls_session_t session, opaque * data, size_t size,
       return GNUTLS_E_INVALID_REQUEST;
     }
 
-  bufel = _gnutls_handshake_alloc (size, size);
+  bufel = _gnutls_handshake_alloc(session, size, size);
   if (bufel == NULL)
     {
       gnutls_assert ();

diff --git a/lib/gnutls_mbuffers.h b/lib/gnutls_mbuffers.h
index 99b0addf4b9451172c17e05ca4bb4b0d2300fa39..6b3f42485953d56ee172efbbc1155948d8129d51 100644 (file)
--- a/lib/gnutls_mbuffers.h
+++ b/lib/gnutls_mbuffers.h
@@ -93,7 +93,7 @@ _mbuffer_set_uhead_size (mbuffer_st * bufel, size_t size)
 
 
 inline static mbuffer_st *
-_gnutls_handshake_alloc (size_t size, size_t maximum)
+_gnutls_handshake_alloc (gnutls_session_t session, size_t size, size_t maximum)
 {
   mbuffer_st *ret = _mbuffer_alloc (HANDSHAKE_HEADER_SIZE + size,
                                     HANDSHAKE_HEADER_SIZE + maximum);