upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 22:39:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't log spurious error "bad key type" in findmatchingkeys

Browse source 
(cherry picked from commit 4c5d48926a)
This commit is contained in:
Mark Andrews 2025-10-20 16:17:38 +11:00
parent 3a1922f464
commit 2d496ef257
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/dns/dnssec.c
View file

@ -1205,7 +1205,7 @@ findmatchingkeys(const char *directory, bool rrtypekey, char *namebuf,
isc_result_t result;
isc_dir_t dir;
bool dir_open = false, match = false;
unsigned int i, alg;
unsigned int i;
dns_dnsseckey_t *key = NULL;
dst_key_t *dstkey = NULL;
@ -1225,13 +1225,10 @@ findmatchingkeys(const char *directory, bool rrtypekey, char *namebuf,
continue;
}
alg = 0;
for (i = len + 1 + 1; i < dir.entry.length; i++) {
if (!isdigit((unsigned char)dir.entry.name[i])) {
break;
}
alg *= 10;
alg += dir.entry.name[i] - '0';
}
/*
@ -1269,19 +1266,9 @@ findmatchingkeys(const char *directory, bool rrtypekey, char *namebuf,
dstkey = NULL;
result = dst_key_fromnamedfile(dir.entry.name, directory, type,
mctx, &dstkey);
switch (alg) {
case DST_ALG_HMACMD5:
case DST_ALG_HMACSHA1:
case DST_ALG_HMACSHA224:
case DST_ALG_HMACSHA256:
case DST_ALG_HMACSHA384:
case DST_ALG_HMACSHA512:
if (result == DST_R_BADKEYTYPE) {
continue;
}
if (result == DST_R_BADKEYTYPE) {
continue;
}
if (result != ISC_R_SUCCESS) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
DNS_LOGMODULE_DNSSEC, ISC_LOG_WARNING,