From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 9 Feb 2011 21:23:33 +0000 (+0100)
Subject: Added sha224 to the list of MACs.
X-Git-Tag: gnutls_2_99_0~286
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e5fef07ca773e8fc2399c52dce0d4e51c4916ba;p=thirdparty%2Fgnutls.git

Added sha224 to the list of MACs.
---

diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index 1d7d9736a3..e388c1d5f0 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -261,6 +261,7 @@ static const gnutls_hash_entry hash_algorithms[] = {
   {"SHA256", HASH_OID_SHA256, GNUTLS_MAC_SHA256, 32},
   {"SHA384", HASH_OID_SHA384, GNUTLS_MAC_SHA384, 48},
   {"SHA512", HASH_OID_SHA512, GNUTLS_MAC_SHA512, 64},
+  {"SHA224", HASH_OID_SHA224, GNUTLS_MAC_SHA224, 28},
   {"AEAD", NULL, GNUTLS_MAC_AEAD, 0},
   {"MD2", HASH_OID_MD2, GNUTLS_MAC_MD2, 0},     /* not used as MAC */
   {"RIPEMD160", HASH_OID_RMD160, GNUTLS_MAC_RMD160, 20},
diff --git a/lib/x509/x509_int.h b/lib/x509/x509_int.h
index d5842bc31a..11805d53ff 100644
--- a/lib/x509/x509_int.h
+++ b/lib/x509/x509_int.h
@@ -46,6 +46,7 @@
 #define HASH_OID_MD5 "1.2.840.113549.2.5"
 #define HASH_OID_MD2 "1.2.840.113549.2.2"
 #define HASH_OID_RMD160 "1.3.36.3.2.1"
+#define HASH_OID_SHA224 "2.16.840.1.101.3.4.2.4"
 #define HASH_OID_SHA256 "2.16.840.1.101.3.4.2.1"
 #define HASH_OID_SHA384 "2.16.840.1.101.3.4.2.2"
 #define HASH_OID_SHA512 "2.16.840.1.101.3.4.2.3"