Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

verifyalg_add_data_domain: fix for root domain ("").

Browse Source
This commit is contained in:
Giovanni Bajo
2012-04-28 12:59:49 +02:00
committed by Simon Kelley
parent 02bff4f109
commit 7f0485cf53
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/dnssec.c
View File

@@ -100,6 +100,17 @@ typedef struct PendingRRSIGValidation
int keytag; int keytag;
} PendingRRSIGValidation; } PendingRRSIGValidation;
/* strchrnul - like strchr, but when character is not found, returns a pointer to the terminating \0.
This is an existing C GNU extension, but it's easier to reimplement it,
rather than tweaking with configure. */
static char *strchrnul(char *str, char ch)
{
while (*str && *str != ch)
str++;
return str;
}
/* Pass a domain name through a verification hash function. /* Pass a domain name through a verification hash function.
We must pass domain names in DNS wire format, but uncompressed. We must pass domain names in DNS wire format, but uncompressed.
@@ -109,16 +120,19 @@ static void verifyalg_add_data_domain(VerifyAlgCtx *alg, char* name)
{ {
unsigned char len; char *p; unsigned char len; char *p;
while ((p = strchr(name, '.'))) do
{ {
len = p-name; p = strchrnul(name, '.');
alg->vtbl->add_data(alg, &len, 1); if ((len = p-name))
alg->vtbl->add_data(alg, name, len); {
alg->vtbl->add_data(alg, &len, 1);
alg->vtbl->add_data(alg, name, len);
}
name = p+1; name = p+1;
} }
len = strlen(name); while (*p);
alg->vtbl->add_data(alg, &len, 1);
alg->vtbl->add_data(alg, name, len+1); alg->vtbl->add_data(alg, "\0", 1);
} }
/* Pass a DNS domain name in wire format through a hash function. Returns the /* Pass a DNS domain name in wire format through a hash function. Returns the