diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c6aebe2..6ebc24f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -35,7 +35,7 @@ jobs: strategy: matrix: toolchain: - - 1.39.0 + - 1.41.0 - stable runs-on: ubuntu-latest steps: @@ -75,7 +75,7 @@ jobs: - macos-latest - windows-latest toolchain: - - 1.39.0 + - 1.41.0 - stable runs-on: ${{ matrix.platform }} steps: diff --git a/Cargo.lock b/Cargo.lock index aec7181..28f89f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,9 +2,9 @@ # It is not intended for manual editing. [[package]] name = "aho-corasick" -version = "0.7.10" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" +checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" dependencies = [ "memchr", ] @@ -46,9 +46,9 @@ checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" [[package]] name = "base64" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d1ccbaf7d9ec9537465a97bf19edc1a4e158ecb49fc16178202238c569cc42" +checksum = "e223af0dc48c96d4f8342ec01a4974f139df863896b316681efd36742f22cc67" [[package]] name = "bitflags" @@ -155,6 +155,18 @@ dependencies = [ "subtle", ] +[[package]] +name = "der-oid-macro" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74708de7d12618cef724cea09e925ab1ce7469b1e4b43834172bcb735db64bcd" +dependencies = [ + "nom", + "num-bigint", + "num-traits", + "proc-macro-hack", +] + [[package]] name = "der-parser" version = "3.0.4" @@ -166,6 +178,20 @@ dependencies = [ "rusticata-macros", ] +[[package]] +name = "der-parser" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae822698fe2fa899ac2f33698d0b7b2c6d3f3d17167f3e5a3bda9d832e75103" +dependencies = [ + "der-oid-macro", + "nom", + "num-bigint", + "num-traits", + "proc-macro-hack", + "rusticata-macros", +] + [[package]] name = "des" version = "0.4.0" @@ -470,7 +496,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" dependencies = [ - "base64 0.12.1", + "base64 0.12.2", "crypto-mac", "hmac", "rand", @@ -504,7 +530,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59698ea79df9bf77104aefd39cc3ec990cb9693fb59c3b0a70ddf2646fdffb4b" dependencies = [ - "base64 0.12.1", + "base64 0.12.2", "once_cell", "regex", ] @@ -521,6 +547,12 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" +[[package]] +name = "proc-macro-hack" +version = "0.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" + [[package]] name = "proc-macro2" version = "1.0.18" @@ -667,9 +699,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.112" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736aac72d1eafe8e5962d1d1c3d99b0df526015ba40915cb3c49d042e92ec243" +checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" [[package]] name = "sha-1" @@ -753,9 +785,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6" +checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" dependencies = [ "proc-macro2", "quote", @@ -785,18 +817,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13f926965ad00595dd129fa12823b04bbf866e9085ab0a5f2b05b850fbfc344" +checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "893582086c2f98cde18f906265a65b5030a074b1046c674ae898be6519a7f479" +checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" dependencies = [ "proc-macro2", "quote", @@ -964,7 +996,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dba437c45e779568868b2c46ed1d1c57c98d9f868e47c9bcbfe9114d4cbd97d" dependencies = [ "base64 0.11.0", - "der-parser", + "der-parser 3.0.4", + "nom", + "num-bigint", + "rusticata-macros", + "time", +] + +[[package]] +name = "x509-parser" +version = "0.8.0-beta1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cada6d0fb73e366e5b6a3b605f314a14a2453a34b9bfb71455257eff5563988e" +dependencies = [ + "base64 0.12.2", + "der-oid-macro", + "der-parser 4.0.0", + "lazy_static", "nom", "num-bigint", "rusticata-macros", @@ -982,7 +1030,7 @@ dependencies = [ "sha2 0.8.2", "subtle-encoding", "termcolor", - "x509-parser", + "x509-parser 0.7.0", "yubikey-piv", ] @@ -992,7 +1040,7 @@ version = "0.0.3" dependencies = [ "chrono", "cookie-factory", - "der-parser", + "der-parser 4.0.0", "des", "elliptic-curve", "env_logger", @@ -1016,7 +1064,7 @@ dependencies = [ "subtle", "subtle-encoding", "x509", - "x509-parser", + "x509-parser 0.8.0-beta1", "zeroize", ] diff --git a/Cargo.toml b/Cargo.toml index 109a3ed..263070b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ maintenance = { status = "experimental" } [dependencies] chrono = "0.4" cookie-factory = "0.3" -der-parser = "3" +der-parser = "4" des = "0.4" elliptic-curve = { version = "0.4", features = ["weierstrass"] } getrandom = "0.1" @@ -45,7 +45,7 @@ sha2 = "0.9" subtle = "2" subtle-encoding = "0.5" x509 = "0.1.2" -x509-parser = "0.7" +x509-parser = "0.8.0-beta1" zeroize = "1" [dev-dependencies]