der: clarify draft

der: more clarify

Author: dishmaker

der/Cargo.toml

@@ -26,12 +26,14 @@ pem-rfc7468 = { version = "1.0.0-rc.3", optional = true, features = ["alloc"] }
 time = { version = "0.3.4", optional = true, default-features = false }
 zeroize = { version = "1.8", optional = true, default-features = false }
 heapless = { version = "0.8", optional = true, default-features = false }
+tynm = { version = "0.2", optional = true, default-features = false }
 
 [dev-dependencies]
 hex-literal = "1"
 proptest = "1"
 
 [features]
+default = ["clarify"]
 alloc = ["zeroize?/alloc"]
 std = ["alloc"]
 
@@ -41,6 +43,7 @@ derive = ["dep:der_derive"]
 oid = ["dep:const-oid"]
 pem = ["dep:pem-rfc7468", "alloc", "zeroize"]
 real = []
+clarify = ["std", "pem", "dep:tynm"]
 
 [package.metadata.docs.rs]
 all-features = true

der/src/asn1/any.rs

@@ -56,6 +56,13 @@ impl<'a> AnyRef<'a> {
     pub fn value(self) -> &'a [u8] {
         self.value.as_slice()
     }
+    /// Returns [`Tag`] and [`Length`] of self.
+    pub fn header(&self) -> Header {
+        Header {
+            tag: self.tag,
+            length: self.value.len(),
+        }
+    }
 
     /// Attempt to decode this [`AnyRef`] type into the inner value.
     pub fn decode_as<T>(self) -> Result<T, <T as DecodeValue<'a>>::Error>
@@ -66,10 +73,7 @@ impl<'a> AnyRef<'a> {
             return Err(self.tag.unexpected_error(None).to_error().into());
         }
 
-        let header = Header {
-            tag: self.tag,
-            length: self.value.len(),
-        };
+        let header = self.header();
 
         let mut decoder = SliceReader::new(self.value())?;
         let result = T::decode_value(&mut decoder, header)?;

der/src/writer.rs

@@ -1,5 +1,7 @@
 //! Writer trait.
 
+#[cfg(feature = "clarify")]
+pub(crate) mod clarify;
 #[cfg(feature = "pem")]
 pub(crate) mod pem;
 pub(crate) mod slice;
@@ -9,6 +11,9 @@ use crate::Result;
 #[cfg(feature = "std")]
 use std::io;
 
+#[cfg(feature = "clarify")]
+use crate::Tag;
+
 /// Writer trait which outputs encoded DER.
 pub trait Writer {
     /// Write the given DER-encoded bytes as output.
@@ -18,6 +23,48 @@ pub trait Writer {
     fn write_byte(&mut self, byte: u8) -> Result<()> {
         self.write(&[byte])
     }
+
+    #[cfg(feature = "clarify")]
+    /// Should return true for clarify writers
+    fn is_clarify(&self) -> bool {
+        false
+    }
+
+    #[cfg(feature = "clarify")]
+    /// Called when starting next TLV value
+    fn clarify_start_value_type<T>(&mut self) {
+        // can be overrided
+    }
+
+    #[cfg(feature = "clarify")]
+    /// Called when ending next TLV value
+    fn clarify_end_value_type<T>(&mut self) {
+        // can be overrided
+    }
+
+    #[cfg(feature = "clarify")]
+    /// Called when starting next TLV tag
+    fn clarify_start_tag(&mut self, _tag: &Tag) {
+        // can be overrided
+    }
+
+    #[cfg(feature = "clarify")]
+    /// Called when ending next TLV tag
+    fn clarify_end_tag(&mut self, _tag: &Tag) {
+        // can be overrided
+    }
+
+    #[cfg(feature = "clarify")]
+    /// Called when writing field with name
+    fn clarify_field_name(&mut self, _field_name: &str) {
+        // can be overrided
+    }
+
+    #[cfg(feature = "clarify")]
+    // Called when writing choice, e.g. enum name: "DnsName"
+    fn clarify_choice(&mut self, _choice_name: &[u8]) {
+        // can be overrided
+    }
 }
 
 #[cfg(feature = "std")]