- Cleanup some comments and TODO text.

diff --git a/services/authzone.c b/services/authzone.c
index 5f2b7154a9466daa86a836b7c1042f1d718cb94e..b9e0b11ef3bba8f3ea8f995f277e7dfca7cfff0b 100644 (file)
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -8189,7 +8189,6 @@ auth_zone_verify_zonemd_key_with_ds(struct auth_zone* z,
        keystorage->rk.type = htons(LDNS_RR_TYPE_DNSKEY);
        keystorage->rk.rrset_class = htons(z->dclass);
        auth_zone_log(z->name, VERB_QUERY, "zonemd: verify zone DNSKEY with DS");
-       // @TODO add EDE here? we currently just pass NULL
        sec = val_verify_DNSKEY_with_DS(env, ve, keystorage, ds, sigalg,
                why_bogus, NULL, NULL);
        regional_free_all(env->scratch);

diff --git a/sldns/wire2str.c b/sldns/wire2str.c
index d6fb289650b297d8ce51eb2c099ebb31ba999617..74d1b62dfe8d626abf7bb9e12c66032203c13311 100644 (file)
--- a/sldns/wire2str.c
+++ b/sldns/wire2str.c
@@ -1071,7 +1071,7 @@ static int sldns_wire2str_svcparam_mandatory2str(char** s,
        assert(data_len > 0);
 
        if (data_len % sizeof(uint16_t))
-               return -1; // wireformat error, data_len must be multiple of shorts
+               return -1; /* wireformat error, data_len must be multiple of shorts */
        w += sldns_str_print(s, slen, "=");
        w += sldns_print_svcparamkey(s, slen, sldns_read_uint16(data));
        data += 2;

diff --git a/validator/val_utils.c b/validator/val_utils.c
index 18c963d863f196e7361c2cc92ac883bf9e815e0a..e2319ee2399d98074ef0e7cf6a42ec2f7d014bac 100644 (file)
--- a/validator/val_utils.c
+++ b/validator/val_utils.c
@@ -489,7 +489,6 @@ int val_favorite_ds_algo(struct ub_packed_rrset_key* ds_rrset)
        return digest_algo;
 }
 
-// @TODO change the use of this function to _ede function in authzone.c:8111
 enum sec_status
 val_verify_DNSKEY_with_DS(struct module_env* env, struct val_env* ve,
        struct ub_packed_rrset_key* dnskey_rrset,

diff --git a/validator/validator.c b/validator/validator.c
index 75f3220cf3d9caa3e33ff28a9df3570c2cfaa2be..9d3808a5d4b68e008bdf5ae67c39d75cc5ecb1d4 100644 (file)
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -2493,7 +2493,8 @@ ds_response_to_ke(struct module_qstate* qstate, struct val_qstate* vq,
                        /* If they aren't usable, then we treat it like 
                         * there was no DS. */
 
-                       // @TODO add EDE Unsupported DS Digest Type
+                       /* TODO add EDE Unsupported DS Digest Type; this needs
+                        * EDE to be added on non SERVFAIL answers. */
 
                        *ke = key_entry_create_null(qstate->region, 
                                qinfo->qname, qinfo->qname_len, qinfo->qclass,