Move utils.rs functions to x509.rs and remove module

Author: chifflier

src/certificate.rs

@@ -3,12 +3,11 @@
 use crate::error::{X509Error, X509Result};
 use crate::extensions::*;
 use crate::time::ASN1Time;
-use crate::utils::format_serial;
 #[cfg(feature = "validate")]
 use crate::validate::*;
 use crate::x509::{
-    parse_serial, parse_signature_value, AlgorithmIdentifier, SubjectPublicKeyInfo, X509Name,
-    X509Version,
+    format_serial, parse_serial, parse_signature_value, AlgorithmIdentifier, SubjectPublicKeyInfo,
+    X509Name, X509Version,
 };
 
 #[cfg(feature = "verify")]

src/cri_attributes.rs

@@ -121,7 +121,7 @@ pub enum ParsedCriAttribute<'a> {
 
 pub(crate) mod parser {
     use crate::cri_attributes::*;
-    use crate::utils::DirectoryString;
+    use crate::x509::DirectoryString;
     use asn1_rs::{DerParser, Input};
     use lazy_static::lazy_static;
     use nom::combinator::map;

src/extensions/subject_key_identifier.rs

@@ -4,7 +4,7 @@ use std::ops::Deref;
 use asn1_rs::Alias;
 
 use crate::error::X509Error;
-use crate::utils::format_serial;
+use crate::x509::format_serial;
 
 /// <pre>
 /// SubjectKeyIdentifier ::= KeyIdentifier

src/lib.rs

@@ -147,7 +147,6 @@ pub mod revocation_list;
 pub mod signature_algorithm;
 pub mod signature_value;
 pub mod time;
-pub mod utils;
 #[cfg(feature = "validate")]
 #[cfg_attr(docsrs, doc(cfg(feature = "validate")))]
 pub mod validate;

src/prelude.rs

@@ -9,7 +9,6 @@ pub use crate::objects::*;
 pub use crate::pem::*;
 pub use crate::revocation_list::*;
 pub use crate::time::*;
-pub use crate::utils::*;
 #[cfg(feature = "validate")]
 pub use crate::validate::*;
 pub use crate::x509::*;

src/revocation_list.rs

@@ -1,8 +1,9 @@
 use crate::error::{X509Error, X509Result};
 use crate::extensions::*;
 use crate::time::ASN1Time;
-use crate::utils::format_serial;
-use crate::x509::{parse_serial, AlgorithmIdentifier, ReasonCode, X509Name, X509Version};
+use crate::x509::{
+    format_serial, parse_serial, AlgorithmIdentifier, ReasonCode, X509Name, X509Version,
+};
 
 #[cfg(feature = "verify")]
 use crate::verify::verify_signature;

src/utils.rs

@@ -10,8 +10,9 @@ use crate::public_key::*;
 
 use asn1_rs::num_bigint::BigUint;
 use asn1_rs::{
-    Alias, Any, BerError, BitString, DerParser, Enumerated, FromDer, Header, Input, Integer,
-    OptTaggedExplicit, Sequence, Tag, Tagged,
+    Alias, Any, BerError, BitString, BmpString, Choice, DerParser, Enumerated, FromDer, Header,
+    Input, Integer, OptTaggedExplicit, PrintableString, Sequence, Tag, Tagged, TeletexString,
+    UniversalString, Utf8String,
 };
 use core::convert::TryFrom;
 use data_encoding::HEXUPPER;
@@ -71,6 +72,41 @@ newtype_enum! {
     }
 }
 
+/// The DirectoryString type is defined as a choice of PrintableString, TeletexString,
+/// BMPString, UTF8String, and UniversalString.
+///
+/// <pre>
+/// RFC 5280, 4.1.2.4.  Issuer
+///    DirectoryString ::= CHOICE {
+///          teletexString           TeletexString (SIZE (1..MAX)),
+///          printableString         PrintableString (SIZE (1..MAX)),
+///          universalString         UniversalString (SIZE (1..MAX)),
+///          utf8String              UTF8String (SIZE (1..MAX)),
+///          bmpString               BMPString (SIZE (1..MAX))
+///    }
+/// </pre>
+#[derive(Debug, PartialEq, Eq, Choice)]
+#[asn1(parse = "DER", encode = "")]
+pub enum DirectoryString<'a> {
+    Teletex(TeletexString<'a>),
+    Printable(PrintableString<'a>),
+    Universal(UniversalString<'a>),
+    Utf8(Utf8String<'a>),
+    Bmp(BmpString<'a>),
+}
+
+impl fmt::Display for DirectoryString<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            DirectoryString::Teletex(s) => f.write_str(s.as_ref()),
+            DirectoryString::Printable(s) => f.write_str(s.as_ref()),
+            DirectoryString::Universal(s) => f.write_str(s.as_ref()),
+            DirectoryString::Utf8(s) => f.write_str(s.as_ref()),
+            DirectoryString::Bmp(s) => f.write_str(s.as_ref()),
+        }
+    }
+}
+
 /// A generic attribute type and value
 ///
 /// These objects are used as [`RelativeDistinguishedName`] components.
@@ -584,6 +620,15 @@ pub(crate) fn parse_serial(input: Input<'_>) -> IResult<Input<'_>, (&[u8], BigUi
     Ok((rem, (slice, big)))
 }
 
+/// Formats a slice to a colon-separated hex string (for ex `01:02:ff:ff`)
+pub fn format_serial(i: &[u8]) -> String {
+    let mut s = i.iter().fold(String::with_capacity(3 * i.len()), |a, b| {
+        a + &format!("{b:02x}:")
+    });
+    s.pop();
+    s
+}
+
 #[cfg(test)]
 mod tests {
     use crate::certificate::Validity;
@@ -615,6 +660,12 @@ mod tests {
         assert!(r.is_ok());
     }
 
+    #[test]
+    fn test_format_serial() {
+        let b: &[u8] = &[1, 2, 3, 4, 0xff];
+        assert_eq!("01:02:03:04:ff", format_serial(b));
+    }
+
     #[test]
     fn test_x509_name() {
         let name = X509Name {