diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-07-26 16:39:03 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-07-26 16:40:06 +0200 |
| commit | ebac690f3ac6690e4a03935c2b1d2a0fdc02f7cd (patch) | |
| tree | 06523de8bd03691a1298a6a89900179d996dfb7f | |
| parent | 1bcc08a95046de450b18b3a0bb4f110d1f6b522e (diff) | |
| download | gnutls-ebac690f3ac6690e4a03935c2b1d2a0fdc02f7cd.tar.gz | |
renamed NULL MAC to MAC-NULL to prevent clash with NULL cipher.
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | lib/gnutls_algorithms.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -3,6 +3,12 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. See the end for copying conditions. +* Version 2.10.2 (unreleased) + +** libgnutls: Renamed NULL MAC to MAC-NULL to prevent clash with NULL +cipher. This prevented the usage of the TLS ciphersuites with NULL +cipher. + * Version 2.10.1 (released 2010-07-25) ** libgnutls: Added support for broken certificates that indicate RSA diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c index aacbe3410c..1c1e0b2af9 100644 --- a/lib/gnutls_algorithms.c +++ b/lib/gnutls_algorithms.c @@ -236,7 +236,7 @@ static const gnutls_hash_entry hash_algorithms[] = { {"SHA512", HASH_OID_SHA512, GNUTLS_MAC_SHA512, 64}, {"MD2", HASH_OID_MD2, GNUTLS_MAC_MD2, 0}, /* not used as MAC */ {"RIPEMD160", HASH_OID_RMD160, GNUTLS_MAC_RMD160, 20}, - {"NULL", NULL, GNUTLS_MAC_NULL, 0}, + {"MAC-NULL", NULL, GNUTLS_MAC_NULL, 0}, {0, 0, 0, 0} }; |