dsa: reduce Box<[u8]> allocation in SignatureEncoding::to_vec

dsa: refactor: move `SignatureRef` to `signature_ref.rs`

Author: dishmaker

dsa/src/lib.rs

@@ -66,6 +66,7 @@ use pkcs8::spki::ObjectIdentifier;
 
 mod components;
 mod generate;
+mod signature_ref;
 mod signing_key;
 mod size;
 mod verifying_key;
@@ -77,10 +78,10 @@ pub const OID: ObjectIdentifier = ObjectIdentifier::new_unwrap("1.2.840.10040.4.
 
 use alloc::{boxed::Box, vec::Vec};
 use pkcs8::der::{
-    self, Decode, DecodeValue, Encode, EncodeValue, FixedTag, Header, Length, Reader, Sequence,
-    Writer, asn1::UintRef,
+    self, Decode, DecodeValue, Encode, EncodeValue, Header, Length, Reader, Sequence, Writer,
 };
 use signature::SignatureEncoding;
+use signature_ref::{SignatureBoxed, SignatureRef};
 
 /// Container of the DSA signature
 #[derive(Clone, Debug)]
@@ -112,34 +113,33 @@ impl Signature {
     pub fn s(&self) -> &NonZero<BoxedUint> {
         &self.s
     }
+
+    fn to_boxed(&self) -> SignatureBoxed {
+        SignatureBoxed::new(self)
+    }
+    fn to_der_using_ref(&self) -> der::Result<Vec<u8>> {
+        self.to_boxed().to_ref()?.to_der()
+    }
 }
 
 impl<'a> DecodeValue<'a> for Signature {
     type Error = der::Error;
 
-    fn decode_value<R: Reader<'a>>(reader: &mut R, _header: Header) -> der::Result<Self> {
-        let r = UintRef::decode(reader)?;
-        let s = UintRef::decode(reader)?;
-
-        let r = BoxedUint::from_be_slice(r.as_bytes(), r.as_bytes().len() as u32 * 8)
-            .map_err(|_| UintRef::TAG.value_error())?;
-        let s = BoxedUint::from_be_slice(s.as_bytes(), s.as_bytes().len() as u32 * 8)
-            .map_err(|_| UintRef::TAG.value_error())?;
+    fn decode_value<R: Reader<'a>>(reader: &mut R, header: Header) -> der::Result<Self> {
+        let signature_ref = SignatureRef::decode_value(reader, header)?;
 
-        Self::from_components(r, s).ok_or_else(|| reader.error(UintRef::TAG.value_error()))
+        signature_ref.to_owned()
     }
 }
 
 impl EncodeValue for Signature {
     fn value_len(&self) -> der::Result<Length> {
-        UintRef::new(&self.r.to_be_bytes())?.encoded_len()?
-            + UintRef::new(&self.s.to_be_bytes())?.encoded_len()?
+        // TODO: avoid Box<[u8]> allocation here
+        self.to_boxed().to_ref()?.value_len()
     }
 
     fn encode_value(&self, writer: &mut impl Writer) -> der::Result<()> {
-        UintRef::new(&self.r.to_be_bytes())?.encode(writer)?;
-        UintRef::new(&self.s.to_be_bytes())?.encode(writer)?;
-        Ok(())
+        self.to_boxed().to_ref()?.encode_value(writer)
     }
 }
 
@@ -171,7 +171,7 @@ impl SignatureEncoding for Signature {
     }
 
     fn to_vec(&self) -> Vec<u8> {
-        self.to_der().expect("DER encoding error")
+        self.to_der_using_ref().expect("DER encoding error")
     }
 }
 

dsa/src/signature_ref.rs

@@ -0,0 +1,74 @@
+use alloc::boxed::Box;
+use crypto_bigint::{BoxedUint, NonZero};
+use pkcs8::der::{
+    self, Decode, DecodeValue, Encode, EncodeValue, FixedTag, Header, Length, Reader, Sequence,
+    Writer, asn1::UintRef,
+};
+
+use crate::Signature;
+
+pub(crate) struct SignatureBoxed {
+    r: Box<[u8]>,
+    s: Box<[u8]>,
+}
+impl SignatureBoxed {
+    pub fn new(sig: &Signature) -> Self {
+        Self {
+            r: sig.r().to_be_bytes(),
+            s: sig.s().to_be_bytes(),
+        }
+    }
+
+    pub fn to_ref(&self) -> der::Result<SignatureRef<'_>> {
+        Ok(SignatureRef {
+            r: UintRef::new(&self.r)?,
+            s: UintRef::new(&self.s)?,
+        })
+    }
+}
+
+pub(crate) struct SignatureRef<'a> {
+    r: UintRef<'a>,
+    s: UintRef<'a>,
+}
+impl<'a> SignatureRef<'a> {
+    pub fn to_owned(&self) -> der::Result<Signature> {
+        let r = BoxedUint::from_be_slice(self.r.as_bytes(), self.r.as_bytes().len() as u32 * 8)
+            .map_err(|_| UintRef::TAG.value_error())?;
+        let s = BoxedUint::from_be_slice(self.s.as_bytes(), self.s.as_bytes().len() as u32 * 8)
+            .map_err(|_| UintRef::TAG.value_error())?;
+
+        let r = NonZero::new(r)
+            .into_option()
+            .ok_or(UintRef::TAG.value_error())?;
+        let s = NonZero::new(s)
+            .into_option()
+            .ok_or(UintRef::TAG.value_error())?;
+
+        Ok(Signature::from_components(r, s))
+    }
+}
+
+impl<'a> DecodeValue<'a> for SignatureRef<'a> {
+    type Error = der::Error;
+
+    fn decode_value<R: Reader<'a>>(reader: &mut R, header: Header) -> der::Result<Self> {
+        Ok(SignatureRef {
+            r: UintRef::decode(reader)?,
+            s: UintRef::decode(reader)?,
+        })
+    }
+}
+
+impl EncodeValue for SignatureRef<'_> {
+    fn value_len(&self) -> der::Result<Length> {
+        self.r.encoded_len()? + self.s.encoded_len()?
+    }
+
+    fn encode_value(&self, writer: &mut impl Writer) -> der::Result<()> {
+        self.r.encode(writer)?;
+        self.s.encode(writer)?;
+        Ok(())
+    }
+}
+impl<'a> Sequence<'a> for SignatureRef<'a> {}