From e403d24bee75b5cd123ddc987e9dd10f2e43d4d9 Mon Sep 17 00:00:00 2001
From: Ximon Eighteen <3304436+ximon18@users.noreply.github.com>
Date: Thu, 5 Dec 2024 13:00:02 +0100
Subject: [PATCH] Use updated strategy fn naming.

---
 Cargo.lock               |  2 +-
 src/commands/signzone.rs | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 63b8f70..fd50f59 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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",
diff --git a/src/commands/signzone.rs b/src/commands/signzone.rs
index 120a739..8a818cc 100644
--- a/src/commands/signzone.rs
+++ b/src/commands/signzone.rs
@@ -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()