[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-222-g7907180

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=79071807ed3ab81efeac34a32e1d548984191b5c

The branch, master has been updated
       via  79071807ed3ab81efeac34a32e1d548984191b5c (commit)
       via  2cefea15f864a1e9b1b6970bd48a4c0e0f745da4 (commit)
      from  a9b55a42fa65e37fbd00c7359f56b11eaea11e3e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 79071807ed3ab81efeac34a32e1d548984191b5c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jun 13 23:07:18 2010 +0200

    Removed unused functions.

commit 2cefea15f864a1e9b1b6970bd48a4c0e0f745da4
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jun 13 23:06:00 2010 +0200

    Combined the max ticket length with the maximum extension data length.

-----------------------------------------------------------------------

Summary of changes:
 lib/ext_safe_renegotiation.c |   49 ------------------------------------------
 lib/gnutls_handshake.c       |   26 ++++++++++++++++------
 lib/gnutls_int.h             |    1 -
 3 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/lib/ext_safe_renegotiation.c b/lib/ext_safe_renegotiation.c
index 1e67f38..e7ba2d4 100644
--- a/lib/ext_safe_renegotiation.c
+++ b/lib/ext_safe_renegotiation.c
@@ -32,8 +32,6 @@ static int _gnutls_sr_recv_params (gnutls_session_t state,
                                            size_t data_size);
 static int _gnutls_sr_send_params (gnutls_session_t state,
                                            opaque * data, size_t);
-static int _gnutls_sr_pack(extension_priv_data_t epriv, gnutls_buffer_st* ps);
-static int _gnutls_sr_unpack(gnutls_buffer_st* ps, extension_priv_data_t* 
_priv);
 static void _gnutls_sr_deinit_data(extension_priv_data_t priv);
 
 extension_entry_st ext_mod_sr = {
@@ -393,53 +391,6 @@ static void _gnutls_sr_deinit_data(extension_priv_data_t 
priv)
     gnutls_free(priv.ptr);
 }
 
-#if 0
-
-static int _gnutls_sr_pack(extension_priv_data_t epriv, gnutls_buffer_st* ps)
-{
-sr_ext_st* priv = epriv.ptr;
-int ret;
-
-  BUFFER_APPEND_PFX(ps, priv->client_verify_data, 
priv->client_verify_data_len);
-  BUFFER_APPEND_PFX(ps, priv->server_verify_data, 
priv->server_verify_data_len);
-  BUFFER_APPEND_PFX(ps, priv->ri_extension_data, priv->ri_extension_data_len);
-  
-  return 0;
-}
-
-static int _gnutls_sr_unpack(gnutls_buffer_st* ps, extension_priv_data_t* 
_priv)
-{
-sr_ext_st* priv;
-int ret;
-extension_priv_data_t epriv;
-
-  priv = gnutls_calloc(1, sizeof(*priv));
-  if (priv == NULL)
-    {
-      gnutls_assert();
-      return GNUTLS_E_MEMORY_ERROR;
-    }
-
-  BUFFER_POP_NUM(ps, priv->client_verify_data_len);
-  BUFFER_POP(ps, priv->client_verify_data, priv->client_verify_data_len);
-
-  BUFFER_POP_NUM(ps, priv->server_verify_data_len);
-  BUFFER_POP(ps, priv->server_verify_data, priv->server_verify_data_len);
-
-  BUFFER_POP_NUM(ps, priv->ri_extension_data_len);
-  BUFFER_POP(ps, priv->ri_extension_data, priv->ri_extension_data_len);
-  
-  epriv.ptr = priv;
-  *_priv = epriv;
-  
-  ret = 0;
-
-error:
-  return ret;
-}
-
-#endif
-
 /**
  * gnutls_safe_renegotiation_status:
  * @session: is a #gnutls_session_t structure.
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 278c7c6..a84dd42 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -1913,7 +1913,7 @@ _gnutls_copy_comp_methods (gnutls_session_t session,
 /* This should be sufficient by now. It should hold all the extensions
  * plus the headers in a hello message.
  */
-#define MAX_EXT_DATA_LENGTH 4096
+#define MAX_EXT_DATA_LENGTH 65535
 
 /* This function sends the client hello handshake message.
  */
@@ -2138,7 +2138,7 @@ _gnutls_send_server_hello (gnutls_session_t session, int 
again)
 {
   mbuffer_st *bufel = NULL;
   opaque *data = NULL;
-  opaque extdata[MAX_EXT_DATA_LENGTH];
+  opaque *extdata = NULL;
   int extdatalen;
   int pos = 0;
   int datalen, ret = 0;
@@ -2150,22 +2150,32 @@ _gnutls_send_server_hello (gnutls_session_t session, 
int again)
 
   if (again == 0)
     {
+    
+      extdata = gnutls_malloc(MAX_EXT_DATA_LENGTH);
+      if (extdata == NULL)
+        {
+          gnutls_assert();
+          return GNUTLS_E_MEMORY_ERROR;
+        }
+
       datalen = 2 + session_id_len + 1 + GNUTLS_RANDOM_SIZE + 3;
-      extdatalen =
-       _gnutls_gen_extensions (session, extdata, sizeof (extdata),
+      ret =
+       _gnutls_gen_extensions (session, extdata, MAX_EXT_DATA_LENGTH,
                                GNUTLS_EXT_ANY);
 
-      if (extdatalen < 0)
+      if (ret < 0)
        {
          gnutls_assert ();
-         return extdatalen;
+         goto fail;
        }
+      extdatalen = ret;
 
       bufel = _gnutls_handshake_alloc (datalen + extdatalen);
       if (bufel == NULL)
        {
          gnutls_assert ();
-         return GNUTLS_E_MEMORY_ERROR;
+         ret = GNUTLS_E_MEMORY_ERROR;
+         goto fail;
        }
       data = _mbuffer_get_udata_ptr(bufel);
 
@@ -2211,6 +2221,8 @@ _gnutls_send_server_hello (gnutls_session_t session, int 
again)
 
   ret = _gnutls_send_handshake (session, bufel, GNUTLS_HANDSHAKE_SERVER_HELLO);
 
+fail:
+  gnutls_free(extdata);
   return ret;
 }
 
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index b099f11..47bd385 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -86,7 +86,6 @@ typedef struct
 
 #define MAX_SRP_USERNAME 128
 #define MAX_SERVER_NAME_SIZE 128
-#define MAX_SESSION_TICKET_SIZE 65535
 
 #define SESSION_TICKET_KEY_NAME_SIZE 16
 #define SESSION_TICKET_KEY_SIZE 16


hooks/post-receive
-- 
GNU gnutls