[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-33-g78149b9

[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=78149b946d3cff7be0acac9c25209d553a4c7504

The branch, master has been updated
       via  78149b946d3cff7be0acac9c25209d553a4c7504 (commit)
      from  f623b9904535b87ff2a00a31c79d1ec6076979c1 (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 78149b946d3cff7be0acac9c25209d553a4c7504
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat May 22 21:44:54 2010 +0200

    Ignore parsing of ciphersuite or extensions when safe renegotiation is 
disabled.

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

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

diff --git a/lib/ext_safe_renegotiation.c b/lib/ext_safe_renegotiation.c
index 15b9137..3c0a404 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.
    */
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index fe7cd98..b1b44c7 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -864,6 +864,7 @@ _gnutls_server_select_suite (gnutls_session_t session, 
opaque * data,
 
   /* First, check for safe renegotiation SCSV.
    */
+  if (session->internals.priorities.disable_safe_renegotiation == 0) 
   {
     int offset;
 


hooks/post-receive
-- 
GNU gnutls