fixed reading of dnskeys

diff --git a/dnssec.c b/dnssec.c
index bbda9264b707eb6fc65abbceeb616dc73d2219e7..ca9add0b3e9b74bbea2377057cfed9808865ed1a 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -550,6 +550,10 @@ ldns_calc_keytag(const ldns_rr *key)
                return 0;
        }
 
+/*
+printf("calc keytag for key at %p:\n", key);
+ldns_rr_print(stdout, key);
+*/
        ac32 = 0;
        if (ldns_rr_get_type(key) != LDNS_RR_TYPE_DNSKEY) {
                return 0;

diff --git a/host2str.c b/host2str.c
index f5bc4ae53113da3c3ba3c490df5e7dd9c0cf5eb2..ef551375ed5cf4b804ea56ec5dd8055e21275181 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -313,18 +313,15 @@ ldns_rdf2buffer_str_alg(ldns_buffer *output, const ldns_rdf *rdf)
        /* don't use algorithm mnemonics in the presentation format
           this kind of got sneaked into the rfc's */
         uint8_t data = ldns_rdf_data(rdf)[0];
-/*
+
        ldns_lookup_table *lt;
 
        lt = ldns_lookup_by_id(ldns_algorithms, (int) data);
        if (lt) {
                ldns_buffer_printf(output, "%s", lt->name);
        } else {
-*/
                ldns_buffer_printf(output, "%d", data);
-/*
        }
-*/
        return ldns_buffer_status(output);
 }      
 
@@ -883,7 +880,7 @@ ldns_rr2buffer_str(ldns_buffer *output, const ldns_rr *rr)
                        } else if (ldns_rr_get_type(rr) == 255) {
                                ldns_buffer_printf(output, "ANY ");
                        } else {
-                               ldns_buffer_printf(output, "TYPE%d\t", 
+                               ldns_buffer_printf(output, "TYPE%u", 
                                                ldns_rr_get_type(rr));
                        }
                }

diff --git a/rr.c b/rr.c
index 54fe8b7b102598d1da36f85cebf42b0bf809a640..691f7715c5321165df0087c5188493d89ffcae3b 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -2005,7 +2005,6 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
 {LDNS_RR_TYPE_ANY, "TYPE247", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_ANY, "TYPE248", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_ANY, "TYPE249", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-{LDNS_RR_TYPE_DNSKEY, "DNSKEY", 4, 4, type_dnskey_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 /* TODO: no code yet, assume 50 for now */
 {LDNS_RR_TYPE_TSIG, "TSIG", 8, 9, type_tsig_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NSEC3, "NSEC3", 6, 6, type_nsec3_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
@@ -2026,7 +2025,7 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
 const ldns_rr_descriptor *
 ldns_rr_descript(uint16_t type)
 {
-       if (type < LDNS_RDATA_FIELD_DESCRIPTORS_COMMON) {
+       if (type <= LDNS_RDATA_FIELD_DESCRIPTORS_COMMON) {
                return &rdata_field_descriptors[type];
        } else {
                 return &rdata_field_descriptors[0];

diff --git a/test/08-zonereader.tpkg b/test/08-zonereader.tpkg
index 71447d23666601d6b2d672c8936a78fe326d6511..520c155baf8ad0081ed959b44b2721175ae1ca7f 100644 (file)
Binary files a/test/08-zonereader.tpkg and b/test/08-zonereader.tpkg differ