mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

Modify label counts/extractions to use dns_name_depth/dns_name_splitatdepth

Browse Source
This commit is contained in:
Brian Wellington
2000-03-01 22:34:39 +00:00
parent a8d34ca88c
commit aa6003d0eb
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/dns/dnssec.c
View File

@@ -16,7 +16,7 @@
*/ */
/* /*
* $Id: dnssec.c,v 1.21 2000/02/25 01:07:17 halley Exp $ * $Id: dnssec.c,v 1.22 2000/03/01 22:34:39 bwelling Exp $
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
*/ */
@@ -228,7 +228,7 @@ dns_dnssec_sign(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
sig.covered = set->type; sig.covered = set->type;
sig.algorithm = dst_key_alg(key); sig.algorithm = dst_key_alg(key);
sig.labels = dns_name_countlabels(name) - 1; sig.labels = dns_name_depth(name) - 1;
if (dns_name_iswildcard(name)) if (dns_name_iswildcard(name))
sig.labels--; sig.labels--;
sig.originalttl = set->ttl; sig.originalttl = set->ttl;
@@ -335,7 +335,7 @@ dns_dnssec_verify(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
isc_mem_t *mctx, dns_rdata_t *sigrdata) isc_mem_t *mctx, dns_rdata_t *sigrdata)
{ {
dns_rdata_generic_sig_t sig; dns_rdata_generic_sig_t sig;
dns_name_t newname; dns_fixedname_t fnewname;
isc_region_t r; isc_region_t r;
isc_buffer_t envbuf; isc_buffer_t envbuf;
dns_rdata_t *rdatas; dns_rdata_t *rdatas;
@@ -382,14 +382,15 @@ dns_dnssec_verify(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
key, &ctx, &r, NULL); key, &ctx, &r, NULL);
/* if the name is an expanded wildcard, use the wildcard name */ /* if the name is an expanded wildcard, use the wildcard name */
/* labels = dns_name_depth(name) - 1;
* XXXRTH Note! This will not work for names with bitstring labels! if (labels - sig.labels > 0) {
*/ dns_fixedname_init(&fnewname);
dns_name_init(&newname, NULL); dns_name_splitatdepth(name, sig.labels + 1, NULL,
labels = dns_name_countlabels(name) - 1; dns_fixedname_name(&fnewname));
dns_name_getlabelsequence(name, labels - sig.labels, sig.labels + 1, dns_name_toregion(dns_fixedname_name(&fnewname), &r);
&newname); }
dns_name_toregion(&newname, &r); else
dns_name_toregion(name, &r);
/* create an envelope for each rdata: <name|type|class|ttl> */ /* create an envelope for each rdata: <name|type|class|ttl> */
isc_buffer_init(&envbuf, data, sizeof(data), ISC_BUFFERTYPE_BINARY); isc_buffer_init(&envbuf, data, sizeof(data), ISC_BUFFERTYPE_BINARY);