mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

cleanup: allow building DS directly from CDNSKEY

Browse Source 
Relax an assertion in lib/dns/ds.c so that dnssec-cds does
not have to work around it. This will also be useful for
dnssec-dsfromkey.
This commit is contained in:
Tony Finch 2019-01-31 19:34:21 +00:00 committed by Evan Hunt
parent 18d94c806d
commit 2e173bbd24
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/dnssec/dnssec-cds.c
View File

@ -482,7 +482,6 @@ match_key_dsset(keyinfo_t *ki, dns_rdataset_t *dsset, strictness_t strictness)
dns_rdata_ds_t ds; dns_rdata_ds_t ds;
dns_rdata_t dsrdata = DNS_RDATA_INIT; dns_rdata_t dsrdata = DNS_RDATA_INIT;
dns_rdata_t newdsrdata = DNS_RDATA_INIT; dns_rdata_t newdsrdata = DNS_RDATA_INIT;
dns_rdatatype_t keytype;
bool c; bool c;
dns_rdataset_current(dsset, &dsrdata); dns_rdataset_current(dsset, &dsrdata);
@ -493,12 +492,8 @@ match_key_dsset(keyinfo_t *ki, dns_rdataset_t *dsset, strictness_t strictness)
continue; continue;
} }
/* allow for both DNSKEY and CDNSKEY */
keytype = ki->rdata.type;
ki->rdata.type = dns_rdatatype_dnskey;
result = dns_ds_buildrdata(name, &ki->rdata, ds.digest_type, result = dns_ds_buildrdata(name, &ki->rdata, ds.digest_type,
dsbuf, &newdsrdata); dsbuf, &newdsrdata);
ki->rdata.type = keytype;
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
vbprintf(3, "dns_ds_buildrdata(" vbprintf(3, "dns_ds_buildrdata("
"keytag=%d, algo=%d, digest=%d): %s\n", "keytag=%d, algo=%d, digest=%d): %s\n",
@ -826,7 +821,6 @@ ds_from_cdnskey(dns_rdatalist_t *dslist, isc_buffer_t *buf,
return (ISC_R_NOSPACE); return (ISC_R_NOSPACE);
} }
cdnskey->type = dns_rdatatype_dnskey;
rdata = rdata_get(); rdata = rdata_get();
result = dns_ds_buildrdata(name, cdnskey, dtype[i], result = dns_ds_buildrdata(name, cdnskey, dtype[i],
r.base, rdata); r.base, rdata);

3
lib/dns/ds.c
View File

@ -47,7 +47,8 @@ dns_ds_buildrdata(dns_name_t *owner, dns_rdata_t *key,
isc_result_t ret; isc_result_t ret;
REQUIRE(key != NULL); REQUIRE(key != NULL);
REQUIRE(key->type == dns_rdatatype_dnskey); REQUIRE(key->type == dns_rdatatype_dnskey ||
key->type == dns_rdatatype_cdnskey);
if (!dst_ds_digest_supported(digest_type)) { if (!dst_ds_digest_supported(digest_type)) {
return (ISC_R_NOTIMPLEMENTED); return (ISC_R_NOTIMPLEMENTED);

2
lib/dns/include/dns/ds.h
View File

@ -37,7 +37,7 @@ dns_ds_buildrdata(dns_name_t *owner, dns_rdata_t *key,
* Build the rdata of a DS record. * Build the rdata of a DS record.
* *
* Requires: * Requires:
*\li key Points to a valid DNS KEY record. *\li key Points to a valid DNSKEY or CDNSKEY record.
*\li buffer Points to a temporary buffer of at least *\li buffer Points to a temporary buffer of at least
* #DNS_DS_BUFFERSIZE bytes. * #DNS_DS_BUFFERSIZE bytes.
*\li rdata Points to an initialized dns_rdata_t. *\li rdata Points to an initialized dns_rdata_t.