From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 27 Jan 2014 14:14:01 +0000 (+0100)
Subject: Added identifiers for DSA-SHA382 and DSA-SHA512
X-Git-Tag: gnutls_3_3_0pre0~248
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d99c8a451d2b887ec27ec7719e5b690805a90df;p=thirdparty%2Fgnutls.git

Added identifiers for DSA-SHA382 and DSA-SHA512
---

diff --git a/lib/algorithms/sign.c b/lib/algorithms/sign.c
index 04f2645a4b..3dfade089a 100644
--- a/lib/algorithms/sign.c
+++ b/lib/algorithms/sign.c
@@ -71,8 +71,7 @@ static const gnutls_sign_entry sign_algorithms[] = {
 	 GNUTLS_PK_DSA,
 	 GNUTLS_DIG_SHA224, {3, 2}},
 	{"DSA-SHA256", SIG_DSA_SHA256_OID, GNUTLS_SIGN_DSA_SHA256,
-	 GNUTLS_PK_DSA,
-	 GNUTLS_DIG_SHA256, {4, 2}},
+	 GNUTLS_PK_DSA, GNUTLS_DIG_SHA256, {4, 2}},
 	{"RSA-MD5", SIG_RSA_MD5_OID, GNUTLS_SIGN_RSA_MD5, GNUTLS_PK_RSA,
 	 GNUTLS_DIG_MD5, {1, 1}},
 	{"RSA-MD5", "1.3.14.3.2.25", GNUTLS_SIGN_RSA_MD5, GNUTLS_PK_RSA,
@@ -93,6 +92,10 @@ static const gnutls_sign_entry sign_algorithms[] = {
 	 TLS_SIGN_AID_UNKNOWN},
 	{"GOST R 34.10-94", SIG_GOST_R3410_94_OID, 0, 0, 0,
 	 TLS_SIGN_AID_UNKNOWN},
+	{"DSA-SHA384", SIG_DSA_SHA384_OID, GNUTLS_SIGN_DSA_SHA384,
+	 GNUTLS_PK_DSA, GNUTLS_DIG_SHA384, {5, 2}},
+	{"DSA-SHA512", SIG_DSA_SHA512_OID, GNUTLS_SIGN_DSA_SHA512,
+	 GNUTLS_PK_DSA, GNUTLS_DIG_SHA512, {6, 2}},
 	{0, 0, 0, 0, 0, TLS_SIGN_AID_UNKNOWN}
 };
 
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 14e9d726f3..d7790cdf7d 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -664,6 +664,8 @@ typedef enum {
 	GNUTLS_SIGN_ECDSA_SHA256 = 14,
 	GNUTLS_SIGN_ECDSA_SHA384 = 15,
 	GNUTLS_SIGN_ECDSA_SHA512 = 16,
+	GNUTLS_SIGN_DSA_SHA384 = 17,
+	GNUTLS_SIGN_DSA_SHA512 = 18,
 } gnutls_sign_algorithm_t;
 
 /**
diff --git a/lib/x509/common.h b/lib/x509/common.h
index f9139cc90d..358dc072c0 100644
--- a/lib/x509/common.h
+++ b/lib/x509/common.h
@@ -53,6 +53,8 @@
 /* those two from draft-ietf-pkix-sha2-dsa-ecdsa-06 */
 #define SIG_DSA_SHA224_OID "2.16.840.1.101.3.4.3.1"
 #define SIG_DSA_SHA256_OID "2.16.840.1.101.3.4.3.2"
+#define SIG_DSA_SHA384_OID "2.16.840.1.101.3.4.3.3"
+#define SIG_DSA_SHA512_OID "2.16.840.1.101.3.4.3.4"
 
 #define SIG_RSA_MD5_OID "1.2.840.113549.1.1.4"
 #define SIG_RSA_MD2_OID "1.2.840.113549.1.1.2"