- RR Type OPENPGPKEY support (draft-ietf-dane-openpgpkey-07).

git-svn-id: file:///svn/unbound/trunk@3617 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 81b7e85729a51177a080d22a290bde53723f4076..84a5da0905d85b1e35ef80b0a34c383b32433558 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 8 February 2016: Wouter
        - Fix patch typo in prevuous commit for 734 from Adi Prasaja.
        - RR Type CSYNC support RFC 7477, in debug printout and config input.
+       - RR Type OPENPGPKEY support (draft-ietf-dane-openpgpkey-07).
 
 29 January 2016: Wouter
        - Neater cmdline_verbose increment patch from Edgar Pettijohn.

diff --git a/sldns/rrdef.c b/sldns/rrdef.c
index 3c501ebb0d47a7bdc4ed277f63578cc69b01f1cc..80b47da1646556a325c7c790db87ea20dffd29b6 100644 (file)
--- a/sldns/rrdef.c
+++ b/sldns/rrdef.c
@@ -144,6 +144,9 @@ static const sldns_rdf_type type_dhcid_wireformat[] = {
 static const sldns_rdf_type type_talink_wireformat[] = {
        LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_DNAME
 };
+static const sldns_rdf_type type_openpgpkey_wireformat[] = {
+       LDNS_RDF_TYPE_B64
+};
 static const sldns_rdf_type type_csync_wireformat[] = {
        LDNS_RDF_TYPE_INT32, LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_NSEC
 };
@@ -365,7 +368,7 @@ static sldns_rr_descriptor rdata_field_descriptors[] = {
        /* 60 */
        {LDNS_RR_TYPE_CDNSKEY, "CDNSKEY", 4, 4, type_dnskey_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 61 */
-{LDNS_RR_TYPE_NULL, "TYPE61", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+{LDNS_RR_TYPE_OPENPGPKEY, "OPENPGPKEY", 1, 1, type_openpgpkey_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 62 */
        {LDNS_RR_TYPE_CSYNC, "CSYNC", 3, 3, type_csync_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE63", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },

diff --git a/sldns/rrdef.h b/sldns/rrdef.h
index 8b98e05bebfed773d181bf554d60bdceb048f3f8..d9302ec1d191050cb0158b2dd84317ed33d18c71 100644 (file)
--- a/sldns/rrdef.h
+++ b/sldns/rrdef.h
@@ -195,6 +195,7 @@ enum sldns_enum_rr_type
         LDNS_RR_TYPE_TALINK = 58,
        LDNS_RR_TYPE_CDS = 59, /** RFC 7344 */
        LDNS_RR_TYPE_CDNSKEY = 60, /** RFC 7344 */
+       LDNS_RR_TYPE_OPENPGPKEY = 61, /* draft-ietf-dane-openpgpkey */
        LDNS_RR_TYPE_CSYNC = 62, /* RFC 7477 */
 
        LDNS_RR_TYPE_SPF = 99, /* RFC 4408 */