[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-268-g789b253

[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=789b253b7946c1c0136c4f795afa37ffc75fdd80

The branch, master has been updated
       via  789b253b7946c1c0136c4f795afa37ffc75fdd80 (commit)
       via  4e6fabd21e3e0eb5e28e3069af65845a91e2bfea (commit)
       via  523e25492b465e35e90532d072d4536381056926 (commit)
      from  a7af4cea9df35e4088e4153f2c102facc1098a74 (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 789b253b7946c1c0136c4f795afa37ffc75fdd80
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Mar 5 11:00:09 2011 +0100

    handle non fatal errors when receiving record headers.

commit 4e6fabd21e3e0eb5e28e3069af65845a91e2bfea
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Mar 5 10:56:19 2011 +0100

    memcpy -> memmove.

commit 523e25492b465e35e90532d072d4536381056926
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Mar 5 10:55:11 2011 +0100

    removed GMAX

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

Summary of changes:
 lib/gnutls_buffers.c |    2 +-
 lib/gnutls_cipher.c  |    2 +-
 lib/gnutls_int.h     |    2 --
 lib/gnutls_record.c  |    3 +++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index a43e883..5c88319 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -240,7 +240,7 @@ _gnutls_stream_read (gnutls_session_t session, mbuffer_st 
**bufel,
   char *ptr;
   gnutls_transport_ptr_t fd = session->internals.transport_recv_ptr;
 
-  *bufel = _mbuffer_alloc (0, GMAX(max_size, size));
+  *bufel = _mbuffer_alloc (0, MAX(max_size, size));
   if (!*bufel)
     {
       gnutls_assert ();
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index 5952813..64dbbd2 100644
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -612,7 +612,7 @@ _gnutls_ciphertext2compressed (gnutls_session_t session,
   if (compress_size < length)
     return gnutls_assert_val(GNUTLS_E_DECOMPRESSION_FAILED);
 
-  memcpy (compress_data, ciphertext.data, length);
+  memmove (compress_data, ciphertext.data, length);
 
   return length;
 }
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 26c4afd..21d9484 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -71,8 +71,6 @@ typedef struct
 #define DEBUG
 */
 
-#define GMAX(x,y) ((x>y)?(x):(y))
-
 /* The size of a handshake message should not
  * be larger than this value.
  */
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 68d1548..61bbc8b 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -856,6 +856,9 @@ gnutls_datum_t raw; /* raw headers */
   if ((ret =
        _gnutls_io_read_buffered (session, record->header_size, -1)) != 
record->header_size)
     {
+      if (gnutls_error_is_fatal (ret) == 0)
+        return ret;
+
       gnutls_assert();
       return GNUTLS_E_UNEXPECTED_PACKET_LENGTH;
     }


hooks/post-receive
-- 
GNU gnutls