Added identifiers for DSA-SHA382 and DSA-SHA512

diff --git a/lib/algorithms/sign.c b/lib/algorithms/sign.c
index 04f2645a4b1b03d8c1eb056464279a5d48a97450..3dfade089a6488e08d4b8bcbaa260ffae22f05a1 100644 (file)
--- 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 14e9d726f37494a0b4faffbb8813817ae5dd73f4..d7790cdf7d0995edf4c649c10ce90dd2672430d0 100644 (file)
--- 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 f9139cc90dcbb3c0d13285120544868904a19242..358dc072c0db924dd5eb69012dc1b20b9ce68ad0 100644 (file)
--- 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"