Patches for nameshed prototype.

Cargo.toml

@@ -34,23 +34,27 @@ chrono         = { version = "0.4.35", optional = true, default-features = false
 futures-util   = { version = "0.3", optional = true }
 hashbrown      = { version = "0.16.0", optional = true, default-features = false, features = ["allocator-api2", "inline-more"] } # 0.14.2 introduces explicit hashing
 heapless       = { version = "0.8", optional = true }
+kmip           = { git = "https://github.com/NLnetLabs/kmip-protocol", branch = "next", package = "kmip-protocol", version = "0.5.0", optional = true, features = ["tls-with-rustls"] }
 libc           = { version = "0.2.153", default-features = false, optional = true } # 0.2.79 is the first version that has IP_PMTUDISC_OMIT
 log            = { version = "0.4.22", optional = true }
 parking_lot    = { version = "0.12", optional = true }
 moka           = { version = "0.12.3", optional = true, features = ["future"] }
 openssl        = { version = "0.10.72", optional = true } # 0.10.70 upgrades to 'bitflags' 2.x
 proc-macro2    = { version = "1.0.69", optional = true } # Force proc-macro2 to at least 1.0.69 for minimal-version build
 ring           = { version = "0.17.2", optional = true }
+bcder          = { version = "0.7", optional = true }
 rustversion    = { version = "1", optional = true }
 secrecy        = { version = "0.10", optional = true }
 serde          = { version = "1.0.130", optional = true, features = ["derive"] }
 siphasher      = { version = "1", optional = true }
 smallvec       = { version = "1.3", optional = true }
 tokio          = { version = "1.33", optional = true, features = ["io-util", "macros", "net", "time", "sync", "rt-multi-thread" ] }
 tokio-rustls   = { version = "0.26", optional = true, default-features = false }
-tokio-stream   = { version = "0.1.1", optional = true }
+tokio-stream   = { version = "0.1.17", optional = true }
 tracing        = { version = "0.1.40", optional = true, features = ["log"] }
 tracing-subscriber = { version = "0.3.18", optional = true, features = ["env-filter"] }
+url            = { version = "2.5.4", optional = true }
+uuid           = { version = "1.17.0", optional = true, features = ["v4"] }
 
 [features]
 default     = ["std", "rand"]
@@ -66,8 +70,9 @@ std         = ["alloc", "dep:hashbrown", "bumpalo?/std", "bytes?/std", "octseq/s
 tracing     = ["dep:log", "dep:tracing"]
 
 # Cryptographic backends
-ring    = ["dep:ring"]
-openssl = ["dep:openssl"]
+ring        = ["dep:ring"]
+openssl     = ["dep:openssl"]
+kmip        = ["dep:kmip", "dep:bcder", "dep:url", "dep:uuid", "dep:openssl"]
 
 # Crate features
 net         = ["bytes", "futures-util", "rand", "std", "tokio"]

Changelog.md

@@ -16,6 +16,8 @@ New
   record types and added presentation format support for the `SVCB`/`HTTPS`
   record types. ([#569])
 * Add support for the `CAA` record type. ([#434] by [@weilence])
+* Added `FreezeBuilder` to the message compressors. ([#601] by
+  [@rossmacarthur])
 
 Improvements
 
@@ -76,9 +78,11 @@ Other changes
 [#570]: https://github.com/NLnetLabs/domain/pull/570
 [#593]: https://github.com/NLnetLabs/domain/pull/593
 [#594]: https://github.com/NLnetLabs/domain/pull/594
+[#601]: https://github.com/NLnetLabs/domain/pull/601
 [@rossmacarthur]: https://github.com/rossmacarthur
 [@weilence]: https://github.com/weilence
 [@WhyNotHugo]: https://github.com/WhyNotHugo
+[@rossmacarthur]: https://github.com/rossmacarthur
 
 
 ## 0.11.1

src/base/message_builder.rs

@@ -2373,6 +2373,15 @@ impl<Target: Composer> Truncate for TreeCompressor<Target> {
     }
 }
 
+#[cfg(feature = "std")]
+impl<Target: FreezeBuilder> FreezeBuilder for TreeCompressor<Target> {
+    type Octets = Target::Octets;
+
+    fn freeze(self) -> Self::Octets {
+        self.target.freeze()
+    }
+}
+
 //------------ HashCompressor ------------------------------------------------
 
 /// A domain name compressor that uses a hash table.
@@ -2639,6 +2648,15 @@ impl<Target: Composer> Truncate for HashCompressor<Target> {
     }
 }
 
+#[cfg(feature = "std")]
+impl<Target: FreezeBuilder> FreezeBuilder for HashCompressor<Target> {
+    type Octets = Target::Octets;
+
+    fn freeze(self) -> Self::Octets {
+        self.target.freeze()
+    }
+}
+
 //============ Errors ========================================================
 
 /// An error occurred when attempting to add data to a message.
@@ -2880,6 +2898,22 @@ mod test {
         assert_eq!(&expect[..], msg.as_ref());
     }
 
+    // just check into_message compiles for all compressors
+    #[test]
+    fn compressor_into_message() {
+        let target = StaticCompressor::new(Vec::new());
+        let _msg =
+            MessageBuilder::from_target(target).unwrap().into_message();
+
+        let target = TreeCompressor::new(Vec::new());
+        let _msg =
+            MessageBuilder::from_target(target).unwrap().into_message();
+
+        let target = HashCompressor::new(Vec::new());
+        let _msg =
+            MessageBuilder::from_target(target).unwrap().into_message();
+    }
+
     #[test]
     fn compress_positive_response() {
         // An example positive response to `A example.com.` that is compressed