HHIT and BRID draft RR types

diff --git a/configure.ac b/configure.ac
index b5807f4df696a69b8c1f7f4900698691240f9f6f..4b3513526a885e88dbafe4834d5c6cc0dfa84567 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -763,6 +763,15 @@ case "$enable_rrtypes_cla_ipn" in
        no|*)
                ;;
 esac
+AC_ARG_ENABLE(rrtypes-hhit-brid, AS_HELP_STRING([--enable-rrtypes-hhit-brid],[Enable draft RR types HHIT and BRID.]))
+if test "x$enable_draft_rrtypes" = "xyes"; then enable_rrtypes_hhit_brid="yes"; fi
+case "$enable_rrtypes_hhit_brid" in
+       yes)
+               AC_DEFINE_UNQUOTED([RRTYPE_HHIT_BRID], [], [Define this to enable RR types HHIT and BRID.])
+               ;;
+       no|*)
+               ;;
+esac
 
 
 if echo "$tmp_LIBS" | grep "ws2_32" >/dev/null; then

diff --git a/ldns/rr.h b/ldns/rr.h
index dbffc83986d04a2230c8214532527efa8848f4f2..d2e4ee90aa9c620486a46cf034e01476031ccc07 100644 (file)
--- a/ldns/rr.h
+++ b/ldns/rr.h
@@ -195,6 +195,8 @@ enum ldns_enum_rr_type
        LDNS_RR_TYPE_SVCB = 64, /* RFC 9460 */
        LDNS_RR_TYPE_HTTPS = 65, /* RFC 9460 */
        LDNS_RR_TYPE_DSYNC = 66, /* RFC 9859 */
+       LDNS_RR_TYPE_HHIT = 67, /* draft-ietf-drip-registries-28 */
+       LDNS_RR_TYPE_BRID = 68, /* draft-ietf-drip-registries-28 */
 
        LDNS_RR_TYPE_SPF = 99, /* RFC 4408 */
 

diff --git a/rr.c b/rr.c
index d5a2b99e8834346898d37a57c6b953477ef95be6..bae06fd5014ec3c182a686de20379a19eb9a3fec 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -2038,6 +2038,14 @@ static const ldns_rdf_type type_dsync_wireformat[] = {
        LDNS_RDF_TYPE_DNAME
 };
 #endif
+#ifdef RRTYPE_HHIT_BRID
+static const ldns_rdf_type type_hhit_wireformat[] = {
+       LDNS_RDF_TYPE_B64
+};
+static const ldns_rdf_type type_brid_wireformat[] = {
+       LDNS_RDF_TYPE_B64
+};
+#endif
 
 /* nsec3 is some vars, followed by same type of data of nsec */
 static const ldns_rdf_type type_nsec3_wireformat[] = {
@@ -2306,12 +2314,20 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
 {LDNS_RR_TYPE_NULL, "TYPE65", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 #endif
 #ifdef RRTYPE_DSYNC
-{LDNS_RR_TYPE_DSYNC, "DSYNC", 4, 4, type_dsync_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 1 },
+       /* 66 */
+       {LDNS_RR_TYPE_DSYNC, "DSYNC", 4, 4, type_dsync_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 1 },
 #else
 {LDNS_RR_TYPE_NULL, "TYPE66", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 #endif
+#ifdef RRTYPE_HHIT_BRID
+       /* 67 */
+       {LDNS_RR_TYPE_HHIT, "HHIT", 1, 1, type_hhit_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+       /* 68 */
+       {LDNS_RR_TYPE_BRID, "BRID", 1, 1, type_brid_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+#else
 {LDNS_RR_TYPE_NULL, "TYPE67", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE68", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+#endif
 {LDNS_RR_TYPE_NULL, "TYPE69", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE70", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE71", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },

diff --git a/test/05-iana-rr-types.tpkg/05-iana-rr-types.test b/test/05-iana-rr-types.tpkg/05-iana-rr-types.test
index a30dc07617d2aa58489f578e1a06081b47f23e9e..cdf816546d24fdd74e095b59158fefc849dc95b8 100644 (file)
--- a/test/05-iana-rr-types.tpkg/05-iana-rr-types.test
+++ b/test/05-iana-rr-types.tpkg/05-iana-rr-types.test
@@ -9,7 +9,7 @@ PATH=$PATH:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:.
 # first arg is the build dir
 TPKG_BUILD=$1
 PARAM_XML="dns-parameters.xml"
-PARAM_URL="http://www.iana.org/assignments/dns-parameters/$PARAM_XML"
+PARAM_URL="https://www.iana.org/assignments/dns-parameters/$PARAM_XML"
 
 if [ -f $PARAM_XML ]
 then