diff --git a/Cargo.lock b/Cargo.lock index f80ca3b..bedbd2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -74,6 +74,45 @@ dependencies = [ "term", ] +[[package]] +name = "asn1-rs" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom 7.1.1", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.9", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" +dependencies = [ + "proc-macro2", + "quote 1.0.17", + "syn", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote 1.0.17", + "syn", +] + [[package]] name = "atty" version = "0.2.14" @@ -369,7 +408,7 @@ dependencies = [ "simpledateformat", "u2f", "x509", - "x509-parser 0.9.2", + "x509-parser 0.13.1", "yubico_manager", "yubikey", ] @@ -411,7 +450,7 @@ dependencies = [ "libc", "num-integer", "num-traits", - "time", + "time 0.1.44", "wasm-bindgen", "winapi", ] @@ -561,18 +600,6 @@ dependencies = [ "crypto-bigint", ] -[[package]] -name = "der-oid-macro" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4cccf60bb98c0fca115a581f894aed0e43fa55bf289fdac5599bec440bb4fd6" -dependencies = [ - "nom 6.1.2", - "num-bigint", - "num-traits", - "syn", -] - [[package]] name = "der-oid-macro" version = "0.5.0" @@ -584,30 +611,31 @@ dependencies = [ "syn", ] -[[package]] -name = "der-parser" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7ededb7525bb4114bc209685ce7894edc2965f4914312a1ea578a645a237f0" -dependencies = [ - "der-oid-macro 0.4.0", - "nom 6.1.2", - "num-bigint", - "num-traits", - "rusticata-macros 3.2.0", -] - [[package]] name = "der-parser" version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cddf120f700b411b2b02ebeb7f04dc0b7c8835909a6c2f52bf72ed0dd3433b2" dependencies = [ - "der-oid-macro 0.5.0", + "der-oid-macro", "nom 7.1.1", "num-bigint", "num-traits", - "rusticata-macros 4.1.0", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom 7.1.1", + "num-bigint", + "num-traits", + "rusticata-macros", ] [[package]] @@ -699,6 +727,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +dependencies = [ + "proc-macro2", + "quote 1.0.17", + "syn", +] + [[package]] name = "dyn-clone" version = "1.0.5" @@ -1458,6 +1497,15 @@ dependencies = [ "libc", ] +[[package]] +name = "num_threads" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" +dependencies = [ + "libc", +] + [[package]] name = "object" version = "0.27.1" @@ -1467,15 +1515,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "oid-registry" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6aae73e474f83beacd8ae2179e328e03d63d9223949d97e1b7c108059a34715" -dependencies = [ - "der-parser 5.1.2", -] - [[package]] name = "oid-registry" version = "0.2.0" @@ -1485,6 +1524,15 @@ dependencies = [ "der-parser 6.0.1", ] +[[package]] +name = "oid-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" +dependencies = [ + "asn1-rs", +] + [[package]] name = "once_cell" version = "1.10.0" @@ -1663,13 +1711,11 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "0.8.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" +checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" dependencies = [ "base64 0.13.0", - "once_cell", - "regex", ] [[package]] @@ -2004,15 +2050,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rusticata-macros" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbee512c633ecabd4481c40111b6ded03ddd9ab10ba6caa5a74e14c889921ad" -dependencies = [ - "nom 6.1.2", -] - [[package]] name = "rusticata-macros" version = "4.1.0" @@ -2463,6 +2500,24 @@ dependencies = [ "winapi", ] +[[package]] +name = "time" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" +dependencies = [ + "itoa", + "libc", + "num_threads", + "time-macros", +] + +[[package]] +name = "time-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -2553,7 +2608,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "time", + "time 0.1.44", ] [[package]] @@ -2794,24 +2849,6 @@ dependencies = [ "cookie-factory", ] -[[package]] -name = "x509-parser" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64abca276c58f8341ddc13fd4bd6ae75993cc669043f5b34813c90f7dff04771" -dependencies = [ - "base64 0.13.0", - "chrono", - "data-encoding", - "der-parser 5.1.2", - "lazy_static", - "nom 6.1.2", - "oid-registry 0.1.5", - "rusticata-macros 3.2.0", - "rustversion", - "thiserror", -] - [[package]] name = "x509-parser" version = "0.12.0" @@ -2825,10 +2862,28 @@ dependencies = [ "lazy_static", "nom 7.1.1", "oid-registry 0.2.0", - "rusticata-macros 4.1.0", + "rusticata-macros", "thiserror", ] +[[package]] +name = "x509-parser" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64bcfe6a33d9a2d5451de520881469863bd05a095f6b6f7f2ad1a5cd8d4ea2f" +dependencies = [ + "asn1-rs", + "base64 0.13.0", + "data-encoding", + "der-parser 7.0.0", + "lazy_static", + "nom 7.1.1", + "oid-registry 0.4.0", + "rusticata-macros", + "thiserror", + "time 0.3.9", +] + [[package]] name = "xxhash-rust" version = "0.8.4" diff --git a/Cargo.toml b/Cargo.toml index 2a9b214..35d5520 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,13 +21,13 @@ openpgp-card = "0.2" openpgp-card-pcsc = "0.2" openpgp-card-sequoia = "0.0.8" sequoia-openpgp = "1.3.0" -chrono = "0.4.19" -simpledateformat = "0.1.2" -ring = "0.16.20" -openssl = "0.10.35" -pem = "0.8.3" +chrono = "0.4" +simpledateformat = "0.1" +ring = "0.16" +openssl = "0.10" +pem = "1.0" yubikey = "0.5" yubico_manager = "0.9" x509 = "0.2" -x509-parser = "0.9" +x509-parser = "0.13" #ctap-hid-fido2 = "2.1.3"