From 57bb088c7d5d487aded63064198e611a11d08c5d Mon Sep 17 00:00:00 2001
From: "Tony Arcieri (iqlusion)" <tony@iqlusion.io>
Date: Mon, 14 Nov 2022 13:30:55 -0700
Subject: [PATCH] yubikey-cli: bump `x509-parser` to v0.14 (#441)

---
 Cargo.lock          | 60 ++++-----------------------------------------
 cli/Cargo.toml      |  2 +-
 cli/src/terminal.rs | 12 +++++++--
 3 files changed, 16 insertions(+), 58 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 637b694..5836df5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -315,30 +315,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "der-oid-macro"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c73af209b6a5dc8ca7cbaba720732304792cddc933cfea3d74509c2b1ef2f436"
-dependencies = [
- "num-bigint",
- "num-traits",
- "syn",
-]
-
-[[package]]
-name = "der-parser"
-version = "6.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cddf120f700b411b2b02ebeb7f04dc0b7c8835909a6c2f52bf72ed0dd3433b2"
-dependencies = [
- "der-oid-macro",
- "nom",
- "num-bigint",
- "num-traits",
- "rusticata-macros",
-]
-
 [[package]]
 name = "der-parser"
 version = "8.1.0"
@@ -682,15 +658,6 @@ dependencies = [
  "libm",
 ]
 
-[[package]]
-name = "oid-registry"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe554cb2393bc784fd678c82c84cc0599c31ceadc7f03a594911f822cb8d1815"
-dependencies = [
- "der-parser 6.0.1",
-]
-
 [[package]]
 name = "oid-registry"
 version = "0.6.0"
@@ -1281,23 +1248,6 @@ dependencies = [
  "cookie-factory",
 ]
 
-[[package]]
-name = "x509-parser"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc90836a84cb72e6934137b1504d0cae304ef5d83904beb0c8d773bbfe256ed"
-dependencies = [
- "base64",
- "chrono",
- "data-encoding",
- "der-parser 6.0.1",
- "lazy_static",
- "nom",
- "oid-registry 0.2.0",
- "rusticata-macros",
- "thiserror",
-]
-
 [[package]]
 name = "x509-parser"
 version = "0.14.0"
@@ -1307,10 +1257,10 @@ dependencies = [
  "asn1-rs",
  "base64",
  "data-encoding",
- "der-parser 8.1.0",
+ "der-parser",
  "lazy_static",
  "nom",
- "oid-registry 0.6.0",
+ "oid-registry",
  "rusticata-macros",
  "thiserror",
  "time 0.3.17",
@@ -1322,7 +1272,7 @@ version = "0.6.0"
 dependencies = [
  "chrono",
  "cookie-factory",
- "der-parser 8.1.0",
+ "der-parser",
  "des",
  "elliptic-curve",
  "env_logger",
@@ -1347,7 +1297,7 @@ dependencies = [
  "subtle-encoding",
  "uuid",
  "x509",
- "x509-parser 0.14.0",
+ "x509-parser",
  "zeroize",
 ]
 
@@ -1362,7 +1312,7 @@ dependencies = [
  "sha2",
  "subtle-encoding",
  "termcolor",
- "x509-parser 0.12.0",
+ "x509-parser",
  "yubikey",
 ]
 
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 19de4b5..73b4eaf 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -22,5 +22,5 @@ log = "0.4"
 sha2 = "0.10"
 subtle-encoding = "0.5"
 termcolor = "1"
-x509-parser = "0.12"
+x509-parser = "0.14"
 yubikey = { version = "0.6", path = ".." }
diff --git a/cli/src/terminal.rs b/cli/src/terminal.rs
index db7114d..8b5a2db 100644
--- a/cli/src/terminal.rs
+++ b/cli/src/terminal.rs
@@ -207,12 +207,20 @@ pub fn print_cert_info(
                 print_cert_attr(
                     stream,
                     "Not Before",
-                    cert.tbs_certificate.validity.not_before.to_rfc2822(),
+                    cert.tbs_certificate
+                        .validity
+                        .not_before
+                        .to_rfc2822()
+                        .unwrap(),
                 )?;
                 print_cert_attr(
                     stream,
                     "Not After",
-                    cert.tbs_certificate.validity.not_after.to_rfc2822(),
+                    cert.tbs_certificate
+                        .validity
+                        .not_after
+                        .to_rfc2822()
+                        .unwrap(),
                 )?;
             }
             _ => {