From 3ffefedfe8b4dddc8fcbe9a6f420f5832e119c2d Mon Sep 17 00:00:00 2001 From: James Price Date: Mon, 29 Jun 2026 01:20:33 +0200 Subject: [PATCH] added patch to fix PIV slot error --- Cargo.lock | 178 ++--------------------------------------------------- Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 173 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e0d9b55..ed5e6ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -66,7 +66,7 @@ dependencies = [ "io_tee", "nom 8.0.0", "rand", - "secrecy 0.10.3", + "secrecy", "sha2", "tempfile", ] @@ -114,7 +114,6 @@ dependencies = [ "which", "x509", "x509-parser", - "yubikey", ] [[package]] @@ -544,15 +543,6 @@ dependencies = [ "powerfmt", ] -[[package]] -name = "des" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" -dependencies = [ - "cipher", -] - [[package]] name = "dialoguer" version = "0.11.0" @@ -1297,9 +1287,6 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin", -] [[package]] name = "libc" @@ -1307,12 +1294,6 @@ version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" -[[package]] -name = "libm" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -1459,24 +1440,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand", - "serde", - "smallvec", - "zeroize", -] - [[package]] name = "num-conv" version = "0.1.0" @@ -1492,17 +1455,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.19" @@ -1510,7 +1462,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -1638,18 +1589,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -1673,16 +1612,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", -] - [[package]] name = "pcsc" version = "2.8.2" @@ -1740,17 +1669,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - [[package]] name = "pkcs8" version = "0.10.2" @@ -2022,26 +1940,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e33e4fb37ba46888052c763e4ec2acfedd8f00f62897b630cadb6298b833675e" -[[package]] -name = "rsa" -version = "0.9.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7bc1d34159d63536b4d89944e9ab5bb952f45db6fa0b8b03c2f8c09fb5b7171" -dependencies = [ - "byteorder", - "digest", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "subtle", - "zeroize", -] - [[package]] name = "rust-embed" version = "8.3.0" @@ -2163,15 +2061,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secrecy" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" -dependencies = [ - "zeroize", -] - [[package]] name = "secrecy" version = "0.10.3" @@ -2263,17 +2152,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "sha2" version = "0.10.8" @@ -2342,12 +2220,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - [[package]] name = "spki" version = "0.7.3" @@ -2745,15 +2617,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" -[[package]] -name = "uuid" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" -dependencies = [ - "getrandom", -] - [[package]] name = "vcpkg" version = "0.2.15" @@ -3107,40 +2970,6 @@ dependencies = [ "time", ] -[[package]] -name = "yubikey" -version = "0.8.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71240be97248417e072ab49076573dbf96e886478453497e02b49968c0273790" -dependencies = [ - "base16ct", - "chrono", - "cookie-factory", - "der-parser", - "des", - "elliptic-curve", - "hmac", - "log", - "nom 7.1.3", - "num-bigint-dig", - "num-integer", - "num-traits", - "p256", - "p384", - "pbkdf2", - "pcsc", - "rand_core", - "rsa", - "secrecy 0.8.0", - "sha1", - "sha2", - "subtle", - "uuid", - "x509", - "x509-parser", - "zeroize", -] - [[package]] name = "zerocopy" version = "0.7.35" @@ -3181,3 +3010,8 @@ dependencies = [ "quote", "syn 2.0.86", ] + +[[patch.unused]] +name = "yubikey" +version = "0.8.0-pre.0" +source = "git+https://git.ts.zusein.com/james/yubikey.rs.git?rev=200f9be97bff11063aff48678fe2543690655255#200f9be97bff11063aff48678fe2543690655255" diff --git a/Cargo.toml b/Cargo.toml index 22564e9..fc42e18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,6 @@ sha2 = "0.10" which = "5" x509 = "0.2" x509-parser = "0.14" -yubikey = { version = "=0.8.0-pre.0", features = ["untested"] } # Translations i18n-embed = { version = "0.15", features = ["desktop-requester", "fluent-system"] } @@ -62,3 +61,4 @@ which = "5" [patch.crates-io] age-core = { git = "https://github.com/str4d/rage.git", rev = "e08c450aa5d7b1cc5706094080c0042ddd60aaf7" } age-plugin = { git = "https://github.com/str4d/rage.git", rev = "e08c450aa5d7b1cc5706094080c0042ddd60aaf7" } +yubikey = { git = "https://git.ts.zusein.com/james/yubikey.rs.git", rev = "200f9be97bff11063aff48678fe2543690655255" }