ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Change dnssec-ksr key sorting

Browse Source 
Sort keys on algorithm, then keytag. This is more convenient for
testing.
This commit is contained in:
Matthijs Mekking
2024-09-02 17:48:22 +02:00
parent 94e5061151
commit ea1fc5c47b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/dnssec/dnssec-ksr.c
View File

@@ -182,10 +182,14 @@ getkasp(ksr_ctx_t *ksr, dns_kasp_t **kasp) {
}
static int
keytag_cmp(const void *k1, const void *k2) {
keyalgtag_cmp(const void *k1, const void *k2) {
dns_dnsseckey_t **key1 = (dns_dnsseckey_t **)k1;
dns_dnsseckey_t **key2 = (dns_dnsseckey_t **)k2;
if (dst_key_id((*key1)->key) < dst_key_id((*key2)->key)) {
if (dst_key_alg((*key1)->key) < dst_key_alg((*key2)->key)) {
return (-1);
} else if (dst_key_alg((*key1)->key) > dst_key_alg((*key2)->key)) {
return (1);
} else if (dst_key_id((*key1)->key) < dst_key_id((*key2)->key)) {
return (-1);
} else if (dst_key_id((*key1)->key) > dst_key_id((*key2)->key)) {
return (1);
@@ -220,7 +224,7 @@ get_dnskeys(ksr_ctx_t *ksr, dns_dnsseckeylist_t *keys) {
{
keys_sorted[i] = dk;
}
qsort(keys_sorted, n, sizeof(dns_dnsseckey_t *), keytag_cmp);
qsort(keys_sorted, n, sizeof(dns_dnsseckey_t *), keyalgtag_cmp);
while (!ISC_LIST_EMPTY(keys_read)) {
dns_dnsseckey_t *key = ISC_LIST_HEAD(keys_read);
ISC_LIST_UNLINK(keys_read, key, link);

4
bin/tests/system/ksr/ns1/named.conf.in
View File

@@ -79,9 +79,9 @@ dnssec-policy "no-cds" {
dnssec-policy "two-tone" {
offline-ksk yes;
keys {
ksk lifetime unlimited algorithm @DEFAULT_ALGORITHM@;
ksk lifetime unlimited algorithm @ALTERNATIVE_ALGORITHM@;
zsk lifetime P3M algorithm @DEFAULT_ALGORITHM@;
zsk lifetime P5M algorithm @ALTERNATIVE_ALGORITHM@;
ksk lifetime unlimited algorithm @DEFAULT_ALGORITHM@;
zsk lifetime P3M algorithm @DEFAULT_ALGORITHM@;
};
};