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 394c59aa11a052d767ae66bee5343c64107c1319..41f64d227cdf4461fed249203baae958051bd0b1 100644 (file)
--- 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)
            {