From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 21 Jan 2010 21:22:09 +0000 (+0100)
Subject: Always allow initial negotiation. Disable subsequent unsafe renegotiations.
X-Git-Tag: gnutls_2_9_10~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e4981cfbec360a19cfb7470ce96093aaa95b32e;p=thirdparty%2Fgnutls.git

Always allow initial negotiation. Disable subsequent unsafe renegotiations.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
---

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 394c59aa11..41f64d227c 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2422,9 +2422,7 @@ _gnutls_recv_hello (gnutls_session_t session, opaque * data, int datalen)
 	  return GNUTLS_E_SAFE_RENEGOTIATION_FAILED;
 	}
 
-      /* Clients can't tell if it's an initial negotiation */
-      if (session->internals.initial_negotiation_completed ||
-	  session->security_parameters.entity == GNUTLS_CLIENT)
+      if (session->internals.initial_negotiation_completed != 0)
 	{
 	  if (session->internals.priorities.unsafe_renegotiation != 0)
 	    {