[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-295-g8490141

[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=8490141c416eda633965850b9439c88d204ec3f3

The branch, master has been updated
       via  8490141c416eda633965850b9439c88d204ec3f3 (commit)
       via  0255af596882ffbcf4661e9b8947a20cd21a23fa (commit)
      from  3badb4696154b4d3504e119f0b02fc386925fa2f (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 8490141c416eda633965850b9439c88d204ec3f3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Mar 13 08:11:25 2011 +0100

    renamed gnutls_handshake_buffer_* functions to 
gnutls_handshake_hash_buffer_* to separate from new API functions and corrected 
its usage.

commit 0255af596882ffbcf4661e9b8947a20cd21a23fa
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Mar 13 06:55:41 2011 +0100

    Added DSA-SHA256, DSA-SHA224 and RSA-SHA224 to the supported signature 
algorithms list. Suggested by address@hidden

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

Summary of changes:
 lib/gnutls_algorithms.c |    3 +++
 lib/gnutls_buffers.c    |   27 +++++----------------------
 lib/gnutls_buffers.h    |   23 +++++++++++++++++++----
 lib/gnutls_handshake.c  |   14 ++++++++------
 4 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index f5063f1..79a7167 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -2014,11 +2014,14 @@ static const gnutls_sign_entry sign_algorithms[] = {
 /* Keep the contents of this struct the same as the previous one. */
 static const gnutls_sign_algorithm_t supported_sign[] = {
   GNUTLS_SIGN_RSA_SHA1,
+  GNUTLS_SIGN_RSA_SHA224,
   GNUTLS_SIGN_RSA_SHA256,
   GNUTLS_SIGN_RSA_SHA384,
   GNUTLS_SIGN_RSA_SHA512,
   GNUTLS_SIGN_RSA_RMD160,
   GNUTLS_SIGN_DSA_SHA1,
+  GNUTLS_SIGN_DSA_SHA224,
+  GNUTLS_SIGN_DSA_SHA256,
   GNUTLS_SIGN_RSA_MD5,
   GNUTLS_SIGN_RSA_MD2,
   0
diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 725d4a1..cbb0546 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -38,13 +38,8 @@
  *  (see _gnutls_io_read_buffered(), _gnutls_io_write_buffered() etc.)
  * 
  * HANDSHAKE LAYER:
- *  1. Uses a buffer to hold data that was not sent or received
- *  complete. (E.g. sent 10 bytes of a handshake packet that is 20 bytes
- *  long).
- * (see _gnutls_handshake_send_int(), _gnutls_handshake_recv_int())
- *
- *  2. Uses buffer to hold the last received handshake message.
- *  (see _gnutls_handshake_buffer_put() etc.)
+ *  1. Uses buffer to hold the last received handshake message.
+ *  (see _gnutls_handshake_hash_buffer_put() etc.)
  *
  */
 
@@ -1153,7 +1148,7 @@ _gnutls_handshake_io_recv_int (gnutls_session_t session,
  * and finished messages.
  */
 int
-_gnutls_handshake_buffer_put (gnutls_session_t session, opaque * data,
+_gnutls_handshake_hash_buffer_put (gnutls_session_t session, opaque * data,
                               size_t length)
 {
 
@@ -1180,7 +1175,7 @@ _gnutls_handshake_buffer_put (gnutls_session_t session, 
opaque * data,
 }
 
 int
-_gnutls_handshake_buffer_get_size (gnutls_session_t session)
+_gnutls_handshake_hash_buffer_get_size (gnutls_session_t session)
 {
 
   return session->internals.handshake_hash_buffer.length;
@@ -1190,7 +1185,7 @@ _gnutls_handshake_buffer_get_size (gnutls_session_t 
session)
  * and returns data from it (peek mode!)
  */
 int
-_gnutls_handshake_buffer_get_ptr (gnutls_session_t session,
+_gnutls_handshake_hash_buffer_get_ptr (gnutls_session_t session,
                                   opaque ** data_ptr, size_t * length)
 {
   if (length != NULL)
@@ -1205,15 +1200,3 @@ _gnutls_handshake_buffer_get_ptr (gnutls_session_t 
session,
   return 0;
 }
 
-/* Does not free the buffer
- */
-int
-_gnutls_handshake_buffer_empty (gnutls_session_t session)
-{
-
-  _gnutls_buffers_log ("BUF[HSK]: Emptied buffer\n");
-
-  session->internals.handshake_hash_buffer.length = 0;
-
-  return 0;
-}
diff --git a/lib/gnutls_buffers.h b/lib/gnutls_buffers.h
index 0293477..60d2e64 100644
--- a/lib/gnutls_buffers.h
+++ b/lib/gnutls_buffers.h
@@ -46,13 +46,28 @@ int _gnutls_io_clear_peeked_data (gnutls_session_t session);
 ssize_t _gnutls_io_write_buffered (gnutls_session_t session,
                                    mbuffer_st * bufel, unsigned int mflag);
 
-int _gnutls_handshake_buffer_get_size (gnutls_session_t session);
-int _gnutls_handshake_buffer_put (gnutls_session_t session, opaque * data,
+int _gnutls_handshake_hash_buffer_get_size (gnutls_session_t session);
+int _gnutls_handshake_hash_buffer_put (gnutls_session_t session, opaque * data,
                                   size_t length);
-int _gnutls_handshake_buffer_empty (gnutls_session_t session);
-int _gnutls_handshake_buffer_get_ptr (gnutls_session_t session,
+int _gnutls_handshake_hash_buffer_get_ptr (gnutls_session_t session,
                                       opaque ** data_ptr, size_t * length);
 
+#define _gnutls_handshake_hash_buffer_clear(session) 
_gnutls_buffer_clear(&session->internals.handshake_hash_buffer)
+
+
+/* Does not free the buffer
+ */
+static inline void
+_gnutls_handshake_hash_buffer_empty (gnutls_session_t session)
+{
+
+  _gnutls_buffers_log ("BUF[HSK]: Emptied buffer\n");
+
+  session->internals.handshake_hash_buffer.length = 0;
+  return;
+}
+
+
 int _gnutls_handshake_io_cache_int (gnutls_session_t,
                                      gnutls_handshake_description_t,
                                      mbuffer_st * bufel);
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 4d90642..296d06a 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -103,6 +103,8 @@ _gnutls_handshake_hash_buffers_clear (gnutls_session_t 
session)
     }
   session->security_parameters.handshake_mac_handle_type = 0;
   session->internals.handshake_mac_handle_init = 0;
+
+  _gnutls_handshake_hash_buffer_clear (session);
 }
 
 /* this will copy the required values for resuming to
@@ -634,7 +636,7 @@ _gnutls_handshake_hash_pending (gnutls_session_t session)
 
   /* We check if there are pending data to hash.
    */
-  if ((ret = _gnutls_handshake_buffer_get_ptr (session, &data, &siz)) < 0)
+  if ((ret = _gnutls_handshake_hash_buffer_get_ptr (session, &data, &siz)) < 0)
     {
       gnutls_assert ();
       return ret;
@@ -660,7 +662,7 @@ _gnutls_handshake_hash_pending (gnutls_session_t session)
         }
     }
 
-  _gnutls_handshake_buffer_empty (session);
+  _gnutls_handshake_hash_buffer_empty (session);
 
   return 0;
 }
@@ -1118,7 +1120,7 @@ _gnutls_handshake_hash_add_sent (gnutls_session_t session,
     {
       /* do not hash immediatelly since the hash has not yet been initialized 
*/
       if ((ret =
-           _gnutls_handshake_buffer_put (session, dataptr, datalen)) < 0)
+           _gnutls_handshake_hash_buffer_put (session, dataptr, datalen)) < 0)
         {
           gnutls_assert ();
           return ret;
@@ -1290,7 +1292,7 @@ _gnutls_handshake_hash_add_recvd (gnutls_session_t 
session,
 
   /* here we buffer the handshake messages - needed at Finished message */
   if ((ret =
-       _gnutls_handshake_buffer_put (session, header, header_size)) < 0)
+       _gnutls_handshake_hash_buffer_put (session, header, header_size)) < 0)
     {
       gnutls_assert ();
       return ret;
@@ -1299,7 +1301,7 @@ _gnutls_handshake_hash_add_recvd (gnutls_session_t 
session,
   if (datalen > 0)
     {
       if ((ret =
-           _gnutls_handshake_buffer_put (session, dataptr, datalen)) < 0)
+           _gnutls_handshake_hash_buffer_put (session, dataptr, datalen)) < 0)
         {
           gnutls_assert ();
           return ret;
@@ -2264,7 +2266,7 @@ _gnutls_recv_hello_verify_request (gnutls_session_t 
session,
     }
 
   /* reset handshake hash buffers */
-  _gnutls_handshake_buffer_empty (session);
+  _gnutls_handshake_hash_buffer_empty (session);
 
   return 0;
 }


hooks/post-receive
-- 
GNU gnutls