[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-285-g1712d96

[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=1712d9683acf660e4c1b791d8bebbe86dd5e6905

The branch, master has been updated
       via  1712d9683acf660e4c1b791d8bebbe86dd5e6905 (commit)
      from  a1c39af3a757150cf38d3b95fe69a437ca685f91 (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 1712d9683acf660e4c1b791d8bebbe86dd5e6905
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Mar 12 11:54:01 2011 +0100

    do not set default record version (i.e. SSL 3.0) during a re-handshake.

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

Summary of changes:
 lib/gnutls_record.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 4c0278f..e7a7036 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -286,7 +286,7 @@ copy_record_version (gnutls_session_t session,
 {
   gnutls_protocol_t lver;
 
-  if (htype != GNUTLS_HANDSHAKE_CLIENT_HELLO
+  if (session->internals.initial_negotiation_completed || htype != 
GNUTLS_HANDSHAKE_CLIENT_HELLO
       || session->internals.default_record_version[0] == 0)
     {
       lver = gnutls_protocol_get_version (session);
@@ -641,7 +641,7 @@ record_add_to_buffers (gnutls_session_t session,
                 {
                   session_unresumable (session);
                   session_invalidate (session);
-                  ret = GNUTLS_E_FATAL_ALERT_RECEIVED;
+                  ret = gnutls_assert_val(GNUTLS_E_FATAL_ALERT_RECEIVED);
                 }
 
               goto cleanup;
@@ -673,13 +673,12 @@ record_add_to_buffers (gnutls_session_t session,
           if (type == GNUTLS_ALERT || (htype == GNUTLS_HANDSHAKE_CLIENT_HELLO
                                        && type == GNUTLS_HANDSHAKE))
             {
-              ret = GNUTLS_E_GOT_APPLICATION_DATA;
+              ret = gnutls_assert_val(GNUTLS_E_GOT_APPLICATION_DATA);
               goto cleanup;
             }
           else
             {
-              gnutls_assert ();
-              ret = GNUTLS_E_UNEXPECTED_PACKET;
+              ret = gnutls_assert_val(GNUTLS_E_UNEXPECTED_PACKET);
               goto cleanup;
             }
 
@@ -1067,8 +1066,7 @@ begin:
         {
           return 0;
         }
-      gnutls_assert ();
-      return ret;
+      return gnutls_assert_val(ret);
     }
 
   return ret;


hooks/post-receive
-- 
GNU gnutls