Update asn1 to 0.24.0 (#14497)

* Update `asn1` to 0.24.0

Signed-off-by: Facundo Tuesca <facundo.tuesca@trailofbits.com>

* Specify error types for Asn1Writable

Signed-off-by: Facundo Tuesca <facundo.tuesca@trailofbits.com>

* Add tests for missing coverage

Signed-off-by: Facundo Tuesca <facundo.tuesca@trailofbits.com>

---------

Signed-off-by: Facundo Tuesca <facundo.tuesca@trailofbits.com>

Author: facutuesca

Cargo.lock

@@ -21,7 +21,7 @@ rust-version = "1.83.0"
 license = "Apache-2.0 OR BSD-3-Clause"
 
 [workspace.dependencies]
-asn1 = { version = "0.23.1", default-features = false }
+asn1 = { version = "0.24.0", default-features = false }
 base64 = "0.22"
 cc = "1.2.57"
 cfg-if = "1"

Cargo.toml

@@ -707,7 +707,10 @@ mod tests {
         oid: ObjectIdentifier,
         critical: bool,
         ext: &T,
-    ) -> Vec<u8> {
+    ) -> Vec<u8>
+    where
+        <T as SimpleAsn1Writable>::Error: std::fmt::Debug,
+    {
         let ext_value = asn1::write_single(ext).unwrap();
         let ext = Extension {
             extn_id: oid,

src/rust/cryptography-x509-verification/src/policy/extension.rs

@@ -256,6 +256,7 @@ impl<'a> asn1::Asn1Readable<'a> for RawTlv<'a> {
     }
 }
 impl asn1::Asn1Writable for RawTlv<'_> {
+    type Error = asn1::WriteError;
     fn write(&self, w: &mut asn1::Writer<'_>) -> asn1::WriteResult {
         w.write_tlv(self.tag, Some(self.value.len()), move |dest| {
             dest.push_slice(self.value)
@@ -315,9 +316,12 @@ impl<'a, T: asn1::SimpleAsn1Readable<'a>, U> asn1::SimpleAsn1Readable<'a>
     }
 }
 
-impl<T: asn1::SimpleAsn1Writable, U: asn1::SimpleAsn1Writable> asn1::SimpleAsn1Writable
-    for Asn1ReadableOrWritable<T, U>
+impl<
+        T: asn1::SimpleAsn1Writable<Error = asn1::WriteError>,
+        U: asn1::SimpleAsn1Writable<Error = asn1::WriteError>,
+    > asn1::SimpleAsn1Writable for Asn1ReadableOrWritable<T, U>
 {
+    type Error = asn1::WriteError;
     const TAG: asn1::Tag = U::TAG;
     fn write_data(&self, w: &mut asn1::WriteBuf) -> asn1::WriteResult {
         match self {
@@ -655,6 +659,7 @@ impl<'a> asn1::SimpleAsn1Readable<'a> for UnvalidatedVisibleString<'a> {
 }
 
 impl asn1::SimpleAsn1Writable for UnvalidatedVisibleString<'_> {
+    type Error = asn1::WriteError;
     const TAG: asn1::Tag = asn1::VisibleString::TAG;
     fn write_data(&self, _: &mut asn1::WriteBuf) -> asn1::WriteResult {
         unimplemented!();
@@ -675,6 +680,7 @@ impl<'a> Utf8StoredBMPString<'a> {
 }
 
 impl asn1::SimpleAsn1Writable for Utf8StoredBMPString<'_> {
+    type Error = asn1::WriteError;
     const TAG: asn1::Tag = asn1::BMPString::TAG;
     fn write_data(&self, writer: &mut asn1::WriteBuf) -> asn1::WriteResult {
         for ch in self.0.encode_utf16() {
@@ -723,7 +729,8 @@ impl<'a, T: asn1::Asn1Readable<'a>> asn1::Asn1Readable<'a> for WithTlv<'a, T> {
 }
 
 impl<T: asn1::Asn1Writable> asn1::Asn1Writable for WithTlv<'_, T> {
-    fn write(&self, w: &mut asn1::Writer<'_>) -> asn1::WriteResult<()> {
+    type Error = T::Error;
+    fn write(&self, w: &mut asn1::Writer<'_>) -> Result<(), T::Error> {
         self.value.write(w)
     }
 

src/rust/cryptography-x509/src/common.rs

@@ -36,6 +36,7 @@ impl<'a> asn1::SimpleAsn1Readable<'a> for UnvalidatedIA5String<'a> {
 }
 
 impl asn1::SimpleAsn1Writable for UnvalidatedIA5String<'_> {
+    type Error = asn1::WriteError;
     const TAG: asn1::Tag = asn1::IA5String::TAG;
     fn write_data(&self, dest: &mut asn1::WriteBuf) -> asn1::WriteResult {
         dest.push_slice(self.0.as_bytes())

src/rust/cryptography-x509/src/name.rs

@@ -15,16 +15,12 @@ pub(crate) fn encode_der<'p>(
 ) -> pyo3::PyResult<pyo3::Bound<'p, pyo3::types::PyBytes>> {
     let class = value.get_type();
 
-    // TODO error messages are lost since asn1::WriteError does not allow
-    // specifying error messages
     let annotated_type = asn1_types::python_class_to_annotated(py, &class)?;
     let object = asn1_types::AnnotatedTypeObject {
         annotated_type: annotated_type.get(),
         value: value.clone(),
     };
-    let encoded_bytes = asn1::write(|writer| object.write(writer))
-        .map_err(|e| pyo3::exceptions::PyValueError::new_err(e.to_string()))?;
-
+    let encoded_bytes = asn1::write(|writer| object.write(writer))?;
     Ok(pyo3::types::PyBytes::new(py, &encoded_bytes))
 }
 
@@ -34,9 +30,8 @@ pub(crate) fn decode_der<'p>(
     class: &pyo3::Bound<'p, pyo3::types::PyType>,
     value: &'p [u8],
 ) -> pyo3::PyResult<pyo3::Bound<'p, pyo3::PyAny>> {
-    asn1::parse(value, |parser| {
+    Ok(asn1::parse(value, |parser| {
         let annotated_type = asn1_types::python_class_to_annotated(py, class)?;
         decode_annotated_type(py, parser, annotated_type.get())
-    })
-    .map_err(|e| pyo3::exceptions::PyValueError::new_err(e.to_string()))
+    })?)
 }