Merge branch 'main' into notify

Cargo.toml

@@ -13,10 +13,10 @@ path = "src/bin/ldns.rs"
 bytes = "1.8.0"
 chrono = "0.4.38"
 clap = { version = "4.3.4", features = ["derive"] }
-domain = { version = "0.10.3", git = "https://github.com/NLnetLabs/domain.git", features = [
+domain = { version = "0.10.3", git = "https://github.com/NLnetLabs/domain.git", branch = "initial-nsec3-generation", features = [
     "zonefile",
     "bytes",
-    "unstable-validate",
+    "unstable-validator",
     "net",
     "unstable-client-transport",
     "tsig",
@@ -25,15 +25,14 @@ domain = { version = "0.10.3", git = "https://github.com/NLnetLabs/domain.git",
 lexopt = "0.3.0"
 tokio = "1.40.0"
 
-# for implementation of nsec3 hash until domain has it stabilized
-octseq = { version = "0.5.2", features = ["std"] }
-ring = { version = "0.17" }
-
 # This is a workaround. lazy_static 1.0.0 fails to compile, but sharded-slab
 # still uses it. And sharded-slab is used by tracing-subscriber, which is
 # used by domain, which is used by us.
 _unused_lazy_static = { package = "lazy_static", version = "1.0.2" }
 
 [dev-dependencies]
+test_bin = "0.4.0"
 tempfile = "3.14.0"
-domain = { version = "*", git = "https://github.com/NLnetLabs/domain.git", features = ["unstable-stelline"] }
+domain = { version = "*", git = "https://github.com/NLnetLabs/domain.git", branch = "initial-nsec3-generation", features = [
+    "unstable-stelline",
+] }

doc/manual/source/man/dnst-nsec3-hash.rst

@@ -22,7 +22,7 @@ Options
 .. option:: -i <NUMBER>, -t <NUMBER>, --iterations <NUMBER>
 
       Use the given number of additional iterations for the hash
-      calculation. Defaults to 1.
+      calculation. Defaults to 0.
 
 .. option:: -s <HEX STRING>, --salt <HEX STRING>
 

src/commands/mod.rs

@@ -1,5 +1,4 @@
 //! The command of _dnst_.
-
 pub mod help;
 pub mod key2ds;
 pub mod notify;
@@ -20,7 +19,7 @@ use super::error::Error;
 #[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug, clap::Subcommand)]
 pub enum Command {
-    /// Print the NSEC3 hash of a given domain name
+    /// Prints the NSEC3 hash of a given domain name
     #[command(name = "nsec3-hash")]
     Nsec3Hash(self::nsec3hash::Nsec3Hash),