From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 15 Feb 2011 21:21:40 +0000 (+0100)
Subject: The safe renegotiation ciphersuite is not required to be registered.
X-Git-Tag: gnutls_2_99_0~267
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23d535f92d44192fbacffc594262723ff715cf94;p=thirdparty%2Fgnutls.git

The safe renegotiation ciphersuite is not required to be registered.
---

diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index 23e9cdb9b0..9b707558c0 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -522,8 +522,6 @@ typedef struct
 
 /* Safe renegotiation */
 
-#define GNUTLS_RENEGO_PROTECTION_REQUEST { GNUTLS_RENEGO_PROTECTION_REQUEST_MAJOR, GNUTLS_RENEGO_PROTECTION_REQUEST_MINOR }
-
 #define CIPHER_SUITES_COUNT sizeof(cs_algorithms)/sizeof(gnutls_cipher_suite_entry)-1
 
 static const gnutls_cipher_suite_entry cs_algorithms[] = {
@@ -815,11 +813,6 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
                              GNUTLS_CIPHER_AES_128_GCM, GNUTLS_KX_ANON_DH,
                              GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
                              GNUTLS_VERSION_MAX),
-/* Renegotiation hack */
-  GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_RENEGO_PROTECTION_REQUEST,
-                             GNUTLS_CIPHER_UNKNOWN, GNUTLS_KX_UNKNOWN,
-                             GNUTLS_MAC_UNKNOWN, GNUTLS_SSL3,
-                             GNUTLS_VERSION_MAX),
 
   {0, {{0, 0}}, 0, 0, 0, 0, 0}
 };