mirror of
https://github.com/pi-hole/dnsmasq.git
synced 2025-12-19 18:28:25 +00:00
Postpone RRSIG processing after all DNSKEY/DS have been parsed.
This commit is contained in:
committed by
Simon Kelley
parent
e6c2a670fe
commit
4137b84e4e
18
src/dnssec.c
18
src/dnssec.c
@@ -382,7 +382,22 @@ int dnssec_validate(struct dns_header *header, size_t pktlen)
|
|||||||
printf("DNSKEY found\n");
|
printf("DNSKEY found\n");
|
||||||
dnssec_parsekey(header, pktlen, owner, ttl, rdlen, p);
|
dnssec_parsekey(header, pktlen, owner, ttl, rdlen, p);
|
||||||
}
|
}
|
||||||
else if (qtype == T_RRSIG)
|
p += rdlen;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* After we have parsed DNSKEY/DS records, start looking for RRSIGs.
|
||||||
|
We want to do this in a separate step because we want the cache
|
||||||
|
to be already populated with DNSKEYs before parsing signatures. */
|
||||||
|
p = reply;
|
||||||
|
for (i = 0; i < ntohs(header->ancount); i++)
|
||||||
|
{
|
||||||
|
if (!extract_name(header, pktlen, &p, owner, 1, 10))
|
||||||
|
return 0;
|
||||||
|
GETSHORT(qtype, p);
|
||||||
|
GETSHORT(qclass, p);
|
||||||
|
GETLONG(ttl, p);
|
||||||
|
GETSHORT(rdlen, p);
|
||||||
|
if (qtype == T_RRSIG)
|
||||||
{
|
{
|
||||||
printf("RRSIG found\n");
|
printf("RRSIG found\n");
|
||||||
/* TODO: missing logic. We should only validate RRSIGs for which we
|
/* TODO: missing logic. We should only validate RRSIGs for which we
|
||||||
@@ -394,5 +409,6 @@ int dnssec_validate(struct dns_header *header, size_t pktlen)
|
|||||||
}
|
}
|
||||||
p += rdlen;
|
p += rdlen;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user