[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-39-g3ee73d0

[Simon Josefsson]

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=3ee73d04c2a503c4295bd515957b7ea10b5d71d8

The branch, master has been updated
       via  3ee73d04c2a503c4295bd515957b7ea10b5d71d8 (commit)
      from  5428fb885166c7dc44c9c26aa4b8cd6cfa8a1f7c (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 3ee73d04c2a503c4295bd515957b7ea10b5d71d8
Author: Simon Josefsson <address@hidden>
Date:   Sat May 22 22:17:51 2010 +0200

    Readd lost fix from Nikos.

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

Summary of changes:
 lib/ext_safe_renegotiation.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/lib/ext_safe_renegotiation.c b/lib/ext_safe_renegotiation.c
index 6d93bd1..1ee88ef 100644
--- a/lib/ext_safe_renegotiation.c
+++ b/lib/ext_safe_renegotiation.c
@@ -37,6 +37,12 @@ _gnutls_safe_renegotiation_recv_params (gnutls_session_t 
session,
 
   DECR_LEN (data_size, len + 1 /* count the first byte and payload */ );
 
+  if (session->internals.priorities.disable_safe_renegotiation != 0)
+    {
+      gnutls_assert ();
+      return 0;
+    }
+
   /* It is not legal to receive this extension on a renegotiation and
    * not receive it on the initial negotiation.
    */


hooks/post-receive
-- 
GNU gnutls