From: Simon Josefsson <simon@josefsson.org>
Date: Sat, 22 May 2010 20:17:51 +0000 (+0200)
Subject: Readd lost fix from Nikos.
X-Git-Tag: gnutls_2_9_11~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ee73d04c2a503c4295bd515957b7ea10b5d71d8;p=thirdparty%2Fgnutls.git

Readd lost fix from Nikos.
---

diff --git a/lib/ext_safe_renegotiation.c b/lib/ext_safe_renegotiation.c
index 6d93bd1114..1ee88ef20b 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.
    */