* bugfix #342: patch for support for more CERT key types (RFC4398).

diff --git a/Changelog b/Changelog
index cdb8f0f6d2b52ff19382f37e3f360fd82b0e73e6..0fc2adfe34d57f999e813d8e3f5afb4f9cff4372 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@
        * Print correct WHEN in query packet (is not always 1-1-1970)
        * ldns-test-edns: new example tool that detects EDNS support.
        * fix ldns_resolver_send without openssl.
+       * bugfix #342: patch for support for more CERT key types (RFC4398).
 
 1.6.7  2010-11-08
        * EXPERIMENTAL ecdsa implementation, please do not enable on real

diff --git a/host2str.c b/host2str.c
index 671254bb89965ee23e853694d0e396a1b8008cd2..2a14e1f2e29eee491b3044e2d4086344b42088c5 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -63,13 +63,18 @@ ldns_lookup_table ldns_algorithms[] = {
         { 0, NULL }
 };
 
-/* Taken from RFC 2538  */
+/* Taken from RFC 4398  */
 ldns_lookup_table ldns_cert_algorithms[] = {
         { LDNS_CERT_PKIX, "PKIX" },
-       { LDNS_CERT_SPKI, "SPKI" },
-       { LDNS_CERT_PGP, "PGP" },
-       { LDNS_CERT_URI, "URI" },
-       { LDNS_CERT_OID, "OID" },
+        { LDNS_CERT_SPKI, "SPKI" },
+        { LDNS_CERT_PGP, "PGP" },
+        { LDNS_CERT_IPKIX, "IPKIX" },
+        { LDNS_CERT_ISPKI, "ISPKI" },
+        { LDNS_CERT_IPGP, "IPGP" },
+        { LDNS_CERT_ACPKIX, "ACPKIX" },
+        { LDNS_CERT_IACPKIX, "IACPKIX" },
+        { LDNS_CERT_URI, "URI" },
+        { LDNS_CERT_OID, "OID" },
         { 0, NULL }
 };
 

diff --git a/ldns/rdata.h b/ldns/rdata.h
index 2d5af88da4d27fb350210534acda37a49f654eab..90dcbf13818fa2cca2313e96e0bbbaede8e1caee 100644 (file)
--- a/ldns/rdata.h
+++ b/ldns/rdata.h
@@ -113,11 +113,16 @@ typedef enum ldns_enum_rdf_type ldns_rdf_type;
  */
 enum ldns_enum_cert_algorithm
 {
-       LDNS_CERT_PKIX          = 1,
-       LDNS_CERT_SPKI          = 2,
-       LDNS_CERT_PGP           = 3,
-       LDNS_CERT_URI           = 253,
-       LDNS_CERT_OID           = 254
+        LDNS_CERT_PKIX         = 1,
+        LDNS_CERT_SPKI         = 2,
+        LDNS_CERT_PGP          = 3,
+        LDNS_CERT_IPKIX         = 4,
+        LDNS_CERT_ISPKI         = 5,
+        LDNS_CERT_IPGP          = 6,
+        LDNS_CERT_ACPKIX        = 7,
+        LDNS_CERT_IACPKIX       = 8,
+        LDNS_CERT_URI          = 253,
+        LDNS_CERT_OID          = 254
 };
 typedef enum ldns_enum_cert_algorithm ldns_cert_algorithm;