WEBDIENSTE/NLnetLabs-dnst
1
0
Fork 0
mirror of https://github.com/NLnetLabs/dnst.git synced 2026-09-12 04:47:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use updated strategy fn naming.

Browse Source
This commit is contained in:
Ximon Eighteen
2024-12-05 13:00:02 +01:00
parent d355527834
commit e403d24bee
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+1 -1
View File
@@ -334,7 +334,7 @@ dependencies = [
[[package]]
name = "domain"
version = "0.10.3"
source = "git+https://github.com/NLnetLabs/domain?branch=sortedrecords-zonemd-remove-replace-plus-pr444#93259567c56c88b4690a0bbfb07595cb1961af25"
source = "git+https://github.com/NLnetLabs/domain?branch=sortedrecords-zonemd-remove-replace-plus-pr444#b9f9b4a260f53ab82a63c4f84b4965c725bdca6b"
dependencies = [
"arc-swap",
"bytes",
src/commands/signzone.rs
+18 -10
View File
@@ -1586,21 +1586,25 @@ struct UseZskIfNoKskStrat;
impl SigningKeyUsageStrategy<Bytes, KeyPair> for UseZskIfNoKskStrat {
const NAME: &'static str = "Use ZSKs as KSKs if no KSKs key usage strategy";
fn select_ksks(candidate_keys: &[DnssecSigningKey<Bytes, KeyPair>]) -> HashSet<usize> {
let ksks = DefaultSigningKeyUsageStrategy::select_ksks(candidate_keys);
fn select_dnskey_signing_keys(
candidate_keys: &[DnssecSigningKey<Bytes, KeyPair>],
) -> HashSet<usize> {
let ksks = DefaultSigningKeyUsageStrategy::select_dnskey_signing_keys(candidate_keys);
if ksks.is_empty() {
DefaultSigningKeyUsageStrategy::select_zsks(candidate_keys)
DefaultSigningKeyUsageStrategy::select_non_dnskey_signing_keys(candidate_keys)
} else {
ksks
}
}
fn select_zsks(candidate_keys: &[DnssecSigningKey<Bytes, KeyPair>]) -> HashSet<usize> {
let zsks = DefaultSigningKeyUsageStrategy::select_zsks(candidate_keys);
fn select_non_dnskey_signing_keys(
candidate_keys: &[DnssecSigningKey<Bytes, KeyPair>],
) -> HashSet<usize> {
let zsks = DefaultSigningKeyUsageStrategy::select_non_dnskey_signing_keys(candidate_keys);
if zsks.is_empty() {
DefaultSigningKeyUsageStrategy::select_ksks(candidate_keys)
DefaultSigningKeyUsageStrategy::select_dnskey_signing_keys(candidate_keys)
} else {
zsks
}
@@ -1612,9 +1616,11 @@ struct AllKeyStrat;
impl SigningKeyUsageStrategy<Bytes, KeyPair> for AllKeyStrat {
const NAME: &'static str = "All keys (KSK and ZSK) key usage strategy";
fn select_ksks(candidate_keys: &[DnssecSigningKey<Bytes, KeyPair>]) -> HashSet<usize> {
let mut keys = DefaultSigningKeyUsageStrategy::select_ksks(candidate_keys);
keys.extend(DefaultSigningKeyUsageStrategy::select_zsks(candidate_keys));
fn select_dnskey_signing_keys(
candidate_keys: &[DnssecSigningKey<Bytes, KeyPair>],
) -> HashSet<usize> {
let mut keys = DefaultSigningKeyUsageStrategy::select_dnskey_signing_keys(candidate_keys);
keys.extend(DefaultSigningKeyUsageStrategy::select_non_dnskey_signing_keys(candidate_keys));
keys
}
}
@@ -1625,7 +1631,9 @@ struct AllUniqStrat;
impl SigningKeyUsageStrategy<Bytes, KeyPair> for AllUniqStrat {
const NAME: &'static str = "Unique algorithms (all KSK + unique ZSK) key usage strategy";
fn select_ksks(candidate_keys: &[DnssecSigningKey<Bytes, KeyPair>]) -> HashSet<usize> {
fn select_dnskey_signing_keys(
candidate_keys: &[DnssecSigningKey<Bytes, KeyPair>],
) -> HashSet<usize> {
let mut seen_algs = HashSet::new();
candidate_keys
.iter()