Bump rust-asn1 version (#13098)

Author: alex

Cargo.lock

@@ -21,7 +21,7 @@ rust-version = "1.74.0"
 license = "Apache-2.0 OR BSD-3-Clause"
 
 [workspace.dependencies]
-asn1 = { version = "0.21.3", default-features = false }
+asn1 = { version = "0.22.0", default-features = false }
 pyo3 = { version = "0.25", features = ["abi3"] }
 pyo3-build-config = { version = "0.25" }
 openssl = "0.10.73"

Cargo.toml

@@ -243,7 +243,14 @@ impl<'a> asn1::Asn1Readable<'a> for RawTlv<'a> {
 }
 impl asn1::Asn1Writable for RawTlv<'_> {
     fn write(&self, w: &mut asn1::Writer<'_>) -> asn1::WriteResult {
-        w.write_tlv(self.tag, move |dest| dest.push_slice(self.value))
+        w.write_tlv(self.tag, Some(self.value.len()), move |dest| {
+            dest.push_slice(self.value)
+        })
+    }
+
+    fn encoded_length(&self) -> Option<usize> {
+        // TODO: we're missing an API to make this easy.
+        None
     }
 }
 
@@ -304,6 +311,13 @@ impl<T: asn1::SimpleAsn1Writable, U: asn1::SimpleAsn1Writable> asn1::SimpleAsn1W
             Asn1ReadableOrWritable::Write(v) => U::write_data(v, w),
         }
     }
+
+    fn data_length(&self) -> Option<usize> {
+        match self {
+            Asn1ReadableOrWritable::Read(v) => T::data_length(v),
+            Asn1ReadableOrWritable::Write(v) => U::data_length(v),
+        }
+    }
 }
 
 pub trait Asn1Operation {
@@ -579,6 +593,10 @@ impl asn1::SimpleAsn1Writable for UnvalidatedVisibleString<'_> {
     fn write_data(&self, _: &mut asn1::WriteBuf) -> asn1::WriteResult {
         unimplemented!();
     }
+
+    fn data_length(&self) -> Option<usize> {
+        None
+    }
 }
 
 /// A BMPString ASN.1 element, where it is stored as a UTF-8 string in memory.
@@ -598,6 +616,10 @@ impl asn1::SimpleAsn1Writable for Utf8StoredBMPString<'_> {
         }
         Ok(())
     }
+
+    fn data_length(&self) -> Option<usize> {
+        Some(self.0.encode_utf16().count() * 2)
+    }
 }
 
 #[derive(Clone)]
@@ -638,6 +660,10 @@ impl<T: asn1::Asn1Writable> asn1::Asn1Writable for WithTlv<'_, T> {
     fn write(&self, w: &mut asn1::Writer<'_>) -> asn1::WriteResult<()> {
         self.value.write(w)
     }
+
+    fn encoded_length(&self) -> Option<usize> {
+        self.value.encoded_length()
+    }
 }
 
 impl<T: PartialEq> PartialEq for WithTlv<'_, T> {

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

@@ -40,6 +40,9 @@ impl asn1::SimpleAsn1Writable for UnvalidatedIA5String<'_> {
     fn write_data(&self, dest: &mut asn1::WriteBuf) -> asn1::WriteResult {
         dest.push_slice(self.0.as_bytes())
     }
+    fn data_length(&self) -> Option<usize> {
+        Some(self.0.len())
+    }
 }
 
 #[derive(asn1::Asn1Read, asn1::Asn1Write, PartialEq, Eq, Hash)]