v0.1.7

- Fix the display for RDNs with unknown OIDs.

Changelog: v0.1.6...v0.1.7

Author: REinject

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "pe-sign"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2021"
 authors = ["REinject"]
 homepage = "https://github.com/0xlane/pe-sign"

Cargo.toml

@@ -33,7 +33,7 @@ Alternatively, if you have `Cargo` installed, you can easily install it by runni
 ### Usage
 
 ```powershell
-pe-sign (0.1.6) - REinject
+pe-sign (0.1.7) - REinject
 A tool for parsing and verifing PE file signatures
 
 Repository: https://github.com/0xlane/pe-sign

README.md

@@ -33,7 +33,7 @@
 ### 使用说明
 
 ```powershell
-pe-sign (0.1.6) - REinject
+pe-sign (0.1.7) - REinject
 A tool for parsing and verifing PE file signatures
 
 Repository: https://github.com/0xlane/pe-sign

README_zh.md

@@ -82,7 +82,6 @@ impl From<x509_cert::name::RelativeDistinguishedName> for RelativeDistinguishedN
                 .0
                 .iter()
                 .map(|tv| {
-                    let mut ss;
                     let val = match tv.value.tag() {
                         Tag::PrintableString => PrintableStringRef::try_from(&tv.value)
                             .ok()
@@ -119,31 +118,46 @@ impl From<x509_cert::name::RelativeDistinguishedName> for RelativeDistinguishedN
                         best_match
                     };
 
-                    if let (Some(key), Some(val)) = (key, val) {
-                        ss = format!("{}=", key.to_ascii_uppercase());
+                    let key_ss = match key {
+                        Some(key) => key.to_ascii_uppercase(),
+                        None => tv.oid.to_string(),
+                    };
 
-                        let mut iter = val.char_indices().peekable();
-                        while let Some((i, c)) = iter.next() {
-                            match c {
-                                '#' if i == 0 => ss.push_str("\\#"),
-                                ' ' if i == 0 || iter.peek().is_none() => ss.push_str("\\ "),
-                                '"' | '+' | ',' | ';' | '<' | '>' | '\\' => {
-                                    ss = format!("{}\\{}", ss, c)
+                    let val_ss = match val {
+                        Some(val) => {
+                            let mut val_ss = String::new();
+                            let mut iter = val.char_indices().peekable();
+                            while let Some((i, c)) = iter.next() {
+                                match c {
+                                    '#' if i == 0 => val_ss.push_str("\\#"),
+                                    ' ' if i == 0 || iter.peek().is_none() => {
+                                        val_ss.push_str("\\ ")
+                                    }
+                                    '"' | '+' | ',' | ';' | '<' | '>' | '\\' => {
+                                        val_ss = val_ss + &format!("\\{}", c);
+                                    }
+                                    '\x00'..='\x1f' | '\x7f' => {
+                                        val_ss = val_ss + &format!("\\{:02x}", c as u8)
+                                    }
+                                    _ => val_ss.push(c),
                                 }
-                                '\x00'..='\x1f' | '\x7f' => ss = format!("{}\\{:02x}", ss, c as u8),
-                                _ => ss.push(c),
                             }
+
+                            val_ss
                         }
-                    } else {
-                        let value = tv.value.to_der().unwrap();
+                        None => {
+                            let mut val_ss = "#".to_owned();
+                            let value = tv.value.to_der().unwrap();
+
+                            for c in value {
+                                val_ss = val_ss + &format!("{:02x}", c);
+                            }
 
-                        ss = format!("{}=#", tv.oid);
-                        for c in value {
-                            ss = format!("{}{:02x}", ss, c);
+                            val_ss
                         }
-                    }
+                    };
 
-                    ss
+                    format!("{}={}", key_ss, val_ss)
                 })
                 .collect(),
         )
@@ -183,4 +197,16 @@ mod tests {
 
         assert_eq!(rdn.to_string(), "CN=晓羽");
     }
+
+    #[test]
+    fn test_unkown_rdn_oid() {
+        let der_rdn = x509_cert::name::RelativeDistinguishedName::from_der(
+            b"\x31\x13\x30\x11\x06\x0b\x2b\x06\x01\x04\x01\x82\x37\x3c\x02\x01\x03\x13\x02\x43\x4e",
+        )
+        .unwrap();
+
+        let rdn = RelativeDistinguishedName::from(der_rdn);
+
+        assert_eq!(rdn.to_string(), "1.3.6.1.4.1.311.60.2.1.3=CN");
+    }
 }

src/cert/name.rs

@@ -13,7 +13,7 @@ fn cli() -> clap::Command {
     use clap::{arg, value_parser, Command};
 
     Command::new("pe-sign")
-        .version("0.1.6")
+        .version("0.1.7")
         .about("A tool for parsing and verifing PE file signatures\n\nRepository: https://github.com/0xlane/pe-sign\n")
         .author("REinject")
         .help_template("{name} ({version}) - {author}\n{about}\n{all-args}")