Renamed LDNS_STATUS_MALFORMED_RRSIG to LDNS_STATUS_MISSING_RDATA_FIELDS_RRSIG and...

diff --git a/dnssec_verify.c b/dnssec_verify.c
index 42ca42adde53d2941eefe8a832f7dc4cd76b9e47..18f8efc38d3c34cd52fc4b53fc6b37eb289b7cd5 100644 (file)
--- a/dnssec_verify.c
+++ b/dnssec_verify.c
@@ -1798,7 +1798,7 @@ ldns_rrsig2rawsig_buffer(ldns_buffer* rawsig_buf, ldns_rr* rrsig)
                return LDNS_STATUS_CRYPTO_NO_RRSIG;
        }
        if (ldns_rr_rdf(rrsig, 1) == NULL) {
-               return LDNS_STATUS_MALFORMED_RRSIG;
+               return LDNS_STATUS_MISSING_RDATA_FIELDS_RRSIG;
        }
        sig_algo = ldns_rdf2native_int8(ldns_rr_rdf(rrsig, 1));
        /* check for known and implemented algo's now (otherwise 
@@ -1820,7 +1820,7 @@ ldns_rrsig2rawsig_buffer(ldns_buffer* rawsig_buf, ldns_rr* rrsig)
        case LDNS_ECC_GOST:
 #endif
                if (ldns_rr_rdf(rrsig, 8) == NULL) {
-                       return LDNS_STATUS_MALFORMED_RRSIG;
+                       return LDNS_STATUS_MISSING_RDATA_FIELDS_RRSIG;
                }
                if (ldns_rdf2buffer_wire(rawsig_buf, ldns_rr_rdf(rrsig, 8))
                                != LDNS_STATUS_OK) {
@@ -1831,7 +1831,7 @@ ldns_rrsig2rawsig_buffer(ldns_buffer* rawsig_buf, ldns_rr* rrsig)
        case LDNS_DSA_NSEC3:
                /* EVP takes rfc2459 format, which is a tad longer than dns format */
                if (ldns_rr_rdf(rrsig, 8) == NULL) {
-                       return LDNS_STATUS_MALFORMED_RRSIG;
+                       return LDNS_STATUS_MISSING_RDATA_FIELDS_RRSIG;
                }
                if (ldns_convert_dsa_rrsig_rdf2asn1(
                                        rawsig_buf, ldns_rr_rdf(rrsig, 8)) 
@@ -1849,7 +1849,7 @@ ldns_rrsig2rawsig_buffer(ldns_buffer* rawsig_buf, ldns_rr* rrsig)
                 /* EVP produces an ASN prefix on the signature, which is
                  * not used in the DNS */
                if (ldns_rr_rdf(rrsig, 8) == NULL) {
-                       return LDNS_STATUS_MALFORMED_RRSIG;
+                       return LDNS_STATUS_MISSING_RDATA_FIELDS_RRSIG;
                }
                if (ldns_convert_ecdsa_rrsig_rdf2asn1(
                                        rawsig_buf, ldns_rr_rdf(rrsig, 8))
@@ -1965,7 +1965,7 @@ ldns_verify_test_sig_key(ldns_buffer* rawsig_buf, ldns_buffer* verify_buf,
                return LDNS_STATUS_CRYPTO_NO_RRSIG;
        }
        if (ldns_rr_rdf(rrsig, 1) == NULL) {
-               return LDNS_STATUS_MALFORMED_RRSIG;
+               return LDNS_STATUS_MISSING_RDATA_FIELDS_RRSIG;
        }
        sig_algo = ldns_rdf2native_int8(ldns_rr_rdf(rrsig, 1));
 
@@ -1981,7 +1981,7 @@ ldns_verify_test_sig_key(ldns_buffer* rawsig_buf, ldns_buffer* verify_buf,
                 * the base64 encoded key data */
                if (ldns_rr_rdf(key, 3) == NULL) {
                        ldns_buffer_free(key_buf);
-                       return LDNS_STATUS_MALFORMED_RRSIG;
+                       return LDNS_STATUS_MISSING_RDATA_FIELDS_KEY;
                }
                if (ldns_rdf2buffer_wire(key_buf, ldns_rr_rdf(key, 3))
                                != LDNS_STATUS_OK) {
@@ -1993,7 +1993,7 @@ ldns_verify_test_sig_key(ldns_buffer* rawsig_buf, ldns_buffer* verify_buf,
                }
 
                if (ldns_rr_rdf(key, 2) == NULL) {
-                       result = LDNS_STATUS_MALFORMED_RRSIG;
+                       result = LDNS_STATUS_MISSING_RDATA_FIELDS_KEY;
                }
                else if (sig_algo == ldns_rdf2native_int8(
                                        ldns_rr_rdf(key, 2))) {

diff --git a/error.c b/error.c
index 82c8522549e513779ca126731a66118e943a1e89..a6195022ea0bceb265db09614ea0c5cfff7463b8 100644 (file)
--- a/error.c
+++ b/error.c
@@ -88,7 +88,8 @@ ldns_lookup_table ldns_error_str[] = {
        { LDNS_STATUS_DNSSEC_NSEC_RR_NOT_COVERED, "RR not covered by the given NSEC RRs" },
        { LDNS_STATUS_DNSSEC_NSEC_WILDCARD_NOT_COVERED, "wildcard not covered by the given NSEC RRs" },
        { LDNS_STATUS_DNSSEC_NSEC3_ORIGINAL_NOT_FOUND, "original of NSEC3 hashed name could not be found" },
-       { LDNS_STATUS_MALFORMED_RRSIG, "Some of the fields of the RRSIG were missing or malformed" },
+       { LDNS_STATUS_MISSING_RDATA_FIELDS_RRSIG, "The RRSIG has to few rdata fields" },
+       { LDNS_STATUS_MISSING_RDATA_FIELDS_KEY, "The DNSKEY has to few rdata fields" },
        { 0, NULL }
 };
 

diff --git a/ldns/error.h b/ldns/error.h
index c25a8271763409c0dd5e15c312c392ef06c58a52..99d4f0bfe85823c10abd283be550133bdc62a2d9 100644 (file)
--- a/ldns/error.h
+++ b/ldns/error.h
@@ -99,7 +99,8 @@ enum ldns_enum_status {
        LDNS_STATUS_DNSSEC_NSEC_RR_NOT_COVERED,
        LDNS_STATUS_DNSSEC_NSEC_WILDCARD_NOT_COVERED,
        LDNS_STATUS_DNSSEC_NSEC3_ORIGINAL_NOT_FOUND,
-       LDNS_STATUS_MALFORMED_RRSIG
+       LDNS_STATUS_MISSING_RDATA_FIELDS_RRSIG,
+       LDNS_STATUS_MISSING_RDATA_FIELDS_KEY
 };
 typedef enum ldns_enum_status ldns_status;