From: Vladimír Čunát Date: Thu, 12 Jul 2018 15:48:46 +0000 (+0200) Subject: knot_rdata_t field rename X-Git-Tag: v3.0.0~6^2~16 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc648668679f8d415f92ea3ae212eed70603fb8d;p=thirdparty%2Fknot-resolver.git knot_rdata_t field rename --- diff --git a/lib/dnssec.c b/lib/dnssec.c index 216a51cf8..b8b5018b9 100644 --- a/lib/dnssec.c +++ b/lib/dnssec.c @@ -294,12 +294,12 @@ int kr_dnskeys_trusted(kr_rrset_validation_ctx_t *vctx, const knot_rrset_t *ta) /* RFC4035 5.3.1, bullet 8 */ /* ZSK */ /* LATER(optim.): more efficient way to iterate than _at() */ const knot_rdata_t *krr = knot_rdataset_at(&keys->rrs, i); - if (!kr_dnssec_key_zsk(krr->rdata) || kr_dnssec_key_revoked(krr->rdata)) { + if (!kr_dnssec_key_zsk(krr->data) || kr_dnssec_key_revoked(krr->data)) { continue; } struct dseckey *key = NULL; - if (kr_dnssec_key_from_rdata(&key, keys->owner, krr->rdata, krr->len) != 0) { + if (kr_dnssec_key_from_rdata(&key, keys->owner, krr->data, krr->len) != 0) { continue; } if (kr_authenticate_referral(ta, (dnssec_key_t *) key) != 0) { diff --git a/lib/dnssec/signature.c b/lib/dnssec/signature.c index 945d02e0d..5e3ab01ff 100644 --- a/lib/dnssec/signature.c +++ b/lib/dnssec/signature.c @@ -68,7 +68,7 @@ int kr_authenticate_referral(const knot_rrset_t *ref, const dnssec_key_t *key) for (uint16_t i = 0; i < ref->rrs.count; ++i) { dnssec_binary_t ds_rdata = { .size = rd->len, - .data = rd->rdata + .data = rd->data }; ret = authenticate_ds(key, &ds_rdata, knot_ds_digest_type(&ref->rrs, i)); if (ret == 0) { /* Found a good DS */