diff --git a/Cargo.lock b/Cargo.lock index 7542213..50179ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "adler" version = "1.0.2" @@ -8,26 +10,25 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" -version = "0.3.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array", ] [[package]] name = "age-core" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad65fc4325804de2e915f5a50dda38218ed49f97e1270750acef9ff8bb67ac36" +checksum = "a485102f6c7a23e0666b169ba77c9ff6c6d249c05395c379be3cbab48a948e84" dependencies = [ "base64", - "c2-chacha", "chacha20poly1305", "cookie-factory", "hkdf", "nom", - "rand 0.7.3", + "rand", "secrecy", "sha2", "tempfile", @@ -35,14 +36,13 @@ dependencies = [ [[package]] name = "age-plugin" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab66824efab6086bdd70e8be63323579bde82da2f336036b3db504ceb2b9dbac" +checksum = "669954b572c349e6e738d81480444ad577f955f240569707877719ab1f94148a" dependencies = [ "age-core", "bech32", "chrono", - "secrecy", ] [[package]] @@ -63,30 +63,23 @@ dependencies = [ "man", "p256", "pcsc", - "rand 0.7.3", - "secrecy", + "rand", "sha2", "which", "x509", "x509-parser", - "yubikey-piv", + "yubikey", ] [[package]] name = "aho-corasick" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "atty" version = "0.2.14" @@ -117,39 +110,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] -name = "bech32" -version = "0.8.0" +name = "base64ct" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c7f7096bc256f5e5cb960f60dfc4f4ef979ca65abe7fb9d5a4f77150d3783d4" +checksum = "e6b4d9b1225d28d360ec6a231d65af1fd99a2a095154c8040689617290569c5c" + +[[package]] +name = "bech32" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "bitvec" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98fcd36dda4e17b7d7abc64cb549bf0201f4ab71e00700c798ca7e62ed3761fa" -dependencies = [ - "funty", - "radium 0.3.0", - "wyz", -] - -[[package]] -name = "bitvec" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" -dependencies = [ - "funty", - "radium 0.5.3", - "tap", - "wyz", -] +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" @@ -166,16 +142,6 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "c2-chacha" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb6b83fa00a7c53f420893670940c8fdfaa89f9dd9adb52062cca39482a31ab6" -dependencies = [ - "cipher", - "ppv-lite86", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -183,12 +149,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chacha20poly1305" -version = "0.7.1" +name = "chacha20" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1fc18e6d90c40164bf6c317476f2a98f04661e310e79830366b7e914c58a8e" +checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", + "zeroize", +] + +[[package]] +name = "chacha20poly1305" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a" dependencies = [ "aead", + "chacha20", "cipher", "poly1305", "zeroize", @@ -209,22 +188,22 @@ dependencies = [ [[package]] name = "cipher" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ "generic-array", ] [[package]] name = "console" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" +checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" dependencies = [ "encode_unicode", - "lazy_static", "libc", + "once_cell", "regex", "terminal_size", "unicode-width", @@ -233,9 +212,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.4.5" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f6b64db6932c7e49332728e3a6bd82c6b7e16016607d20923b537c3bc4c0d5f" +checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" [[package]] name = "cookie-factory" @@ -244,16 +223,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" [[package]] -name = "cpuid-bool" -version = "0.1.2" +name = "cpufeatures" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" - -[[package]] -name = "cpuid-bool" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" +checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +dependencies = [ + "libc", +] [[package]] name = "crc32fast" @@ -265,20 +241,22 @@ dependencies = [ ] [[package]] -name = "crypto-mac" -version = "0.10.0" +name = "crypto-bigint" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" +checksum = "f83bd3bb4314701c568e340cd8cf78c975aa0ca79e03d3f6d1677d5b0c9c0c03" dependencies = [ "generic-array", + "rand_core", "subtle", + "zeroize", ] [[package]] name = "crypto-mac" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ "generic-array", "subtle", @@ -292,43 +270,43 @@ checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" [[package]] name = "der" -version = "0.1.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f59c66c30bb7445c8320a5f9233e437e3572368099f25532a59054328899b4" +checksum = "28e98c534e9c8a0483aa01d6f6913bc063de254311bd267c9cf535e9b70e15b2" dependencies = [ "const-oid", + "crypto-bigint", ] [[package]] name = "der-oid-macro" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4cccf60bb98c0fca115a581f894aed0e43fa55bf289fdac5599bec440bb4fd6" +checksum = "c73af209b6a5dc8ca7cbaba720732304792cddc933cfea3d74509c2b1ef2f436" dependencies = [ - "nom", - "num-bigint 0.4.0", + "num-bigint", "num-traits", "syn", ] [[package]] name = "der-parser" -version = "5.1.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120842c2385dea19347e2f6e31caa5dced5ba8afdfacaac16c59465fdd1168f2" +checksum = "9807efb310ce4ea172924f3a69d82f9fd6c9c3a19336344591153e665b31c43e" dependencies = [ "der-oid-macro", "nom", - "num-bigint 0.4.0", + "num-bigint", "num-traits", "rusticata-macros", ] [[package]] name = "des" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b24e7c748888aa2fa8bce21d8c64a52efc810663285315ac7476f7197a982fae" +checksum = "ac41dd49fb554432020d52c875fc290e110113f864c6b1b525cd62c7e7747a5d" dependencies = [ "byteorder", "cipher", @@ -337,13 +315,12 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9dd058f8b65922819fabb4a41e7d1964e56344042c26efbccd465202c23fa0c" +checksum = "61579ada4ec0c6031cfac3f86fdba0d195a7ebeb5e36693bd53cb5999a25beeb" dependencies = [ "console", "lazy_static", - "tempfile", "zeroize", ] @@ -356,6 +333,18 @@ dependencies = [ "generic-array", ] +[[package]] +name = "ecdsa" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43ee23aa5b4f68c7a092b5c3beb25f50c406adc75e2363634f242f28ab255372" +dependencies = [ + "der", + "elliptic-curve", + "hmac", + "signature", +] + [[package]] name = "either" version = "1.6.1" @@ -364,17 +353,16 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "elliptic-curve" -version = "0.8.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2db227e61a43a34915680bdda462ec0e212095518020a88a1f91acd16092c39" +checksum = "beca177dcb8eb540133e7680baff45e7cc4d93bf22002676cec549f82343721b" dependencies = [ - "bitvec 0.18.5", + "crypto-bigint", "ff", - "funty", "generic-array", "group", "pkcs8", - "rand_core 0.5.1", + "rand_core", "subtle", "zeroize", ] @@ -387,9 +375,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "env_logger" -version = "0.8.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", "humantime", @@ -400,20 +388,19 @@ dependencies = [ [[package]] name = "ff" -version = "0.8.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01646e077d4ebda82b73f1bca002ea1e91561a77df2431a9e79729bcc31950ef" +checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f" dependencies = [ - "bitvec 0.18.5", - "rand_core 0.5.1", + "rand_core", "subtle", ] [[package]] name = "flate2" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ "cfg-if", "crc32fast", @@ -421,12 +408,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "generic-array" version = "0.14.4" @@ -439,34 +420,23 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "group" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11f9f5fbf1943b48ae7c2bf6846e7d827a512d1be4f23af708f5ca5d01dde1" +checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" dependencies = [ "ff", - "rand_core 0.5.1", + "rand_core", "subtle", ] @@ -492,9 +462,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] @@ -512,17 +482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" dependencies = [ "digest", - "hmac 0.11.0", -] - -[[package]] -name = "hmac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" -dependencies = [ - "crypto-mac 0.10.0", - "digest", + "hmac", ] [[package]] @@ -531,7 +491,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ - "crypto-mac 0.11.0", + "crypto-mac", "digest", ] @@ -550,24 +510,11 @@ dependencies = [ "spin", ] -[[package]] -name = "lexical-core" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if", - "ryu", - "static_assertions", -] - [[package]] name = "libc" -version = "0.2.91" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7" +checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" [[package]] name = "libm" @@ -595,9 +542,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.3.4" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" @@ -611,33 +564,20 @@ dependencies = [ [[package]] name = "nom" -version = "6.1.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" dependencies = [ - "bitvec 0.19.5", - "funty", - "lexical-core", "memchr", + "minimal-lexical", "version_check", ] [[package]] name = "num-bigint" -version = "0.2.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg 1.0.1", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg 1.0.1", "num-integer", @@ -646,9 +586,9 @@ dependencies = [ [[package]] name = "num-bigint-dig" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d51546d704f52ef14b3c962b5776e53d5b862e5790e40a350d366c209bd7f7a" +checksum = "4547ee5541c18742396ae2c895d0717d0f886d8823b8399cdaf7b07d63ad0480" dependencies = [ "autocfg 0.1.7", "byteorder", @@ -657,7 +597,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.7.3", + "rand", "serde", "smallvec", "zeroize", @@ -691,22 +631,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ "autocfg 1.0.1", + "libm", ] [[package]] name = "oid-registry" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2508c8f170e55be68508b1113956a760a82684f42022f8834fb16ca198621211" +checksum = "fe554cb2393bc784fd678c82c84cc0599c31ceadc7f03a594911f822cb8d1815" dependencies = [ "der-parser", ] [[package]] name = "once_cell" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "opaque-debug" @@ -716,36 +657,38 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "p256" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f37a291d378ba3291c1fa4e925edb6729c8593d4c6064be79e4a4c12fa2d97" +checksum = "d053368e1bae4c8a672953397bd1bd7183dde1c72b0b7612a15719173148d186" dependencies = [ + "ecdsa", "elliptic-curve", + "sha2", ] [[package]] name = "p384" -version = "0.6.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea33960aac2200d19a5c9ab06a11ebd48a37a23144496632c358182e6765d80b" +checksum = "f23bc88c404ccc881c8a1ad62ba5cd7d336a64ecbf46de4874f2ad955f67b157" dependencies = [ "elliptic-curve", ] [[package]] name = "pbkdf2" -version = "0.7.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf916dd32dd26297907890d99dc2740e33f6bd9073965af4ccff2967962f5508" +checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739" dependencies = [ - "crypto-mac 0.10.0", + "crypto-mac", ] [[package]] name = "pcsc" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e09a8d8705a2c9b1ffe1f9dd9580efe3f8e80c19fc9f99038fe99b7bb56c83" +checksum = "0f7b356209b9904510024c97332563870af40acdc3ccacbae1b3155b87a6f65b" dependencies = [ "bitflags", "pcsc-sys", @@ -761,172 +704,133 @@ dependencies = [ ] [[package]] -name = "pem" -version = "0.8.3" +name = "pem-rfc7468" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" +checksum = "84e93a3b1cc0510b03020f33f21e62acdde3dcaef432edc95bea377fbd4c2cd4" dependencies = [ - "base64", - "once_cell", - "regex", + "base64ct", +] + +[[package]] +name = "pkcs1" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "116bee8279d783c0cf370efa1a94632f2108e5ef0bb32df31f051647810a4e2c" +dependencies = [ + "der", + "pem-rfc7468", + "zeroize", ] [[package]] name = "pkcs8" -version = "0.3.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4839a901843f3942576e65857f0ebf2e190ef7024d3c62a94099ba3f819ad1d" +checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" dependencies = [ "der", + "pem-rfc7468", + "pkcs1", + "spki", + "zeroize", ] [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" [[package]] name = "poly1305" -version = "0.6.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8" +checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ - "cpuid-bool 0.2.0", + "cpufeatures", + "opaque-debug", "universal-hash", ] [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" dependencies = [ "unicode-xid", ] [[package]] name = "quote" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" - -[[package]] -name = "radium" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" - [[package]] name = "rand" -version = "0.7.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.2", - "rand_hc 0.3.0", + "rand_chacha", + "rand_core", + "rand_hc", ] [[package]] name = "rand_chacha" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.2", + "rand_core", ] [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -dependencies = [ - "getrandom 0.2.2", + "getrandom", ] [[package]] name = "rand_hc" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_hc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" -dependencies = [ - "rand_core 0.6.2", + "rand_core", ] [[package]] name = "redox_syscall" -version = "0.2.5" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.4.5" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", @@ -935,9 +839,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.23" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "remove_dir_all" @@ -956,9 +860,9 @@ checksum = "e33e4fb37ba46888052c763e4ec2acfedd8f00f62897b630cadb6298b833675e" [[package]] name = "rsa" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3648b669b10afeab18972c105e284a7b953a669b0be3514c27f9b17acab2f9cd" +checksum = "e05c2603e2823634ab331437001b411b9ed11660fbc4066f3908c84a9439260d" dependencies = [ "byteorder", "digest", @@ -967,93 +871,78 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "pem", - "rand 0.7.3", - "sha2", - "simple_asn1", + "pkcs1", + "pkcs8", + "rand", "subtle", - "thiserror", "zeroize", ] [[package]] name = "rusticata-macros" -version = "3.0.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7390af60e66c44130b4c5ea85f2555b7ace835d73b4b889c704dc3cb4c0468c8" +checksum = "65c52377bb2288aa522a0c8208947fada1e0c76397f108cc08f57efe6077b50d" dependencies = [ "nom", ] -[[package]] -name = "rustversion" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - [[package]] name = "secrecy" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0673d6a6449f5e7d12a1caf424fd9363e2af3a4953023ed455e3c4beef4597c0" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" dependencies = [ "zeroize", ] [[package]] name = "serde" -version = "1.0.125" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" [[package]] name = "sha-1" -version = "0.9.4" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f" +checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer", "cfg-if", - "cpuid-bool 0.1.2", + "cpufeatures", "digest", "opaque-debug", ] [[package]] name = "sha2" -version = "0.9.3" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de" +checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer", "cfg-if", - "cpuid-bool 0.1.2", + "cpufeatures", "digest", "opaque-debug", ] [[package]] -name = "simple_asn1" -version = "0.4.1" +name = "signature" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b" +checksum = "f2807892cfa58e081aa1f1111391c7a0649d4fa127a4ffbe34bcbfb35a1171a4" dependencies = [ - "chrono", - "num-bigint 0.2.6", - "num-traits", + "digest", + "rand_core", ] [[package]] name = "smallvec" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "spin" @@ -1062,16 +951,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] -name = "static_assertions" -version = "1.1.0" +name = "spki" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +checksum = "5c01a0c15da1b0b0e1494112e7af814a678fec9bd157881b49beac661e9b6f32" +dependencies = [ + "der", +] [[package]] name = "subtle" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subtle-encoding" @@ -1084,9 +976,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.65" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1d708c221c5a612956ef9f75b37e454e88d1f7b899fbd3a18d4252012d663" +checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" dependencies = [ "proc-macro2", "quote", @@ -1095,9 +987,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", @@ -1105,12 +997,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tempfile" version = "3.2.0" @@ -1119,7 +1005,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if", "libc", - "rand 0.8.3", + "rand", "redox_syscall", "remove_dir_all", "winapi", @@ -1136,9 +1022,9 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" dependencies = [ "libc", "winapi", @@ -1146,18 +1032,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", @@ -1166,43 +1052,51 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] [[package]] name = "typenum" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "universal-hash" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ "generic-array", "subtle", ] +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom", +] + [[package]] name = "version_check" version = "0.9.3" @@ -1211,23 +1105,18 @@ checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "which" -version = "4.1.0" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" +checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" dependencies = [ "either", + "lazy_static", "libc", ] @@ -1262,12 +1151,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "x509" version = "0.2.0" @@ -1280,9 +1163,9 @@ dependencies = [ [[package]] name = "x509-parser" -version = "0.9.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64abca276c58f8341ddc13fd4bd6ae75993cc669043f5b34813c90f7dff04771" +checksum = "ffc90836a84cb72e6934137b1504d0cae304ef5d83904beb0c8d773bbfe256ed" dependencies = [ "base64", "chrono", @@ -1292,23 +1175,21 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "rustversion", "thiserror", ] [[package]] -name = "yubikey-piv" -version = "0.3.0" +name = "yubikey" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6da1dc49a2423489aca0d54e337d60492ac24f620cec87b75276d419adc83bb0" +checksum = "e82a7de0613c75d93e4330613e24d859cab51770b081fe92f1dae4a1e38d9177" dependencies = [ "chrono", "cookie-factory", "der-parser", "des", "elliptic-curve", - "getrandom 0.1.16", - "hmac 0.10.1", + "hmac", "log", "nom", "num-bigint-dig", @@ -1318,12 +1199,14 @@ dependencies = [ "p384", "pbkdf2", "pcsc", + "rand_core", "rsa", "secrecy", "sha-1", "sha2", "subtle", "subtle-encoding", + "uuid", "x509", "x509-parser", "zeroize", @@ -1331,18 +1214,18 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.2.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36" +checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.0.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" +checksum = "65f1a51723ec88c66d5d1fe80c841f17f63587d6691901d66be9bec6c3b51f73" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 51be049..a4f6d37 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,25 +22,24 @@ assets = [ ] [dependencies] -age-core = "0.6" -age-plugin = "0.1" +age-core = "0.7" +age-plugin = "0.2" base64 = "0.13" bech32 = "0.8" -console = "0.14" -dialoguer = "0.8" -env_logger = "0.8" +console = { version = "0.15", default-features = false } +dialoguer = { version = "0.9", default-features = false, features = ["password"] } +env_logger = "0.9" gumdrop = "0.8" hex = "0.4" log = "0.4" -p256 = { version = "0.7", features = ["ecdh"] } +p256 = { version = "0.9", features = ["ecdh"] } pcsc = "2.4" -rand = "0.7" -secrecy = "0.7" +rand = "0.8" sha2 = "0.9" which = "4.1" x509 = "0.2" -x509-parser = "0.9" -yubikey-piv = { version = "0.3", features = ["untested"] } +x509-parser = "0.12" +yubikey = { version = "0.5", features = ["untested"] } [dev-dependencies] flate2 = "1" diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 0000000..d2d6255 --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +1.51.0 \ No newline at end of file diff --git a/src/builder.rs b/src/builder.rs index aaf1538..aa694e2 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -1,17 +1,16 @@ use rand::{rngs::OsRng, RngCore}; use x509::RelativeDistinguishedName; -use yubikey_piv::{ +use yubikey::{ certificate::{Certificate, PublicKeyInfo}, - key::{generate as yubikey_generate, AlgorithmId, RetiredSlotId, SlotId}, - policy::{PinPolicy, TouchPolicy}, - Key, YubiKey, + piv::{generate as yubikey_generate, AlgorithmId, RetiredSlotId, SlotId}, + Key, PinPolicy, TouchPolicy, YubiKey, }; use crate::{ error::Error, + key::{self, Stub}, p256::Recipient, util::{Metadata, POLICY_EXTENSION_OID}, - yubikey::{self, Stub}, BINARY_NAME, USABLE_SLOTS, }; @@ -90,7 +89,7 @@ impl IdentityBuilder { // No need to ask for users to enter their PIN if the PIN policy requires it, // because here we _always_ require them to enter their PIN in order to access the // protected management key (which is necessary in order to generate identities). - yubikey::manage(yubikey)?; + key::manage(yubikey)?; if let TouchPolicy::Never = touch_policy { // No need to touch YubiKey diff --git a/src/error.rs b/src/error.rs index 05d0ffb..892a063 100644 --- a/src/error.rs +++ b/src/error.rs @@ -1,6 +1,6 @@ use std::fmt; use std::io; -use yubikey_piv::{key::RetiredSlotId, Serial}; +use yubikey::{piv::RetiredSlotId, Serial}; use crate::util::slot_to_ui; @@ -21,7 +21,7 @@ pub enum Error { SlotIsNotEmpty(RetiredSlotId), TimedOut, UseListForSingleSlot, - YubiKey(yubikey_piv::Error), + YubiKey(yubikey::Error), } impl From for Error { @@ -30,8 +30,8 @@ impl From for Error { } } -impl From for Error { - fn from(e: yubikey_piv::error::Error) -> Self { +impl From for Error { + fn from(e: yubikey::Error) -> Self { Error::YubiKey(e) } } @@ -100,10 +100,10 @@ impl fmt::Debug for Error { writeln!(f, "Use --list to print the recipient for a single slot.")? } Error::YubiKey(e) => match e { - yubikey_piv::error::Error::NotFound => { + yubikey::Error::NotFound => { writeln!(f, "Please insert the YubiKey you want to set up")? } - yubikey_piv::error::Error::WrongPin { tries } => writeln!( + yubikey::Error::WrongPin { tries } => writeln!( f, "Invalid PIN ({} tries remaining before it is blocked)", tries diff --git a/src/format.rs b/src/format.rs index bf2b124..4da1f9e 100644 --- a/src/format.rs +++ b/src/format.rs @@ -1,10 +1,10 @@ use age_core::{ format::{FileKey, Stanza}, primitives::{aead_encrypt, hkdf}, + secrecy::ExposeSecret, }; use p256::{ecdh::EphemeralSecret, elliptic_curve::sec1::ToEncodedPoint}; use rand::rngs::OsRng; -use secrecy::ExposeSecret; use std::convert::TryInto; use crate::{p256::Recipient, STANZA_TAG}; diff --git a/src/yubikey.rs b/src/key.rs similarity index 96% rename from src/yubikey.rs rename to src/key.rs index 10e47ca..b911a56 100644 --- a/src/yubikey.rs +++ b/src/key.rs @@ -3,25 +3,23 @@ use age_core::{ format::{FileKey, FILE_KEY_BYTES}, primitives::{aead_decrypt, hkdf}, + secrecy::ExposeSecret, }; use age_plugin::{identity, Callbacks}; use bech32::{ToBase32, Variant}; use dialoguer::Password; use log::warn; -use secrecy::ExposeSecret; use std::convert::TryInto; use std::fmt; use std::io; use std::iter; use std::thread::sleep; use std::time::{Duration, SystemTime}; -use yubikey_piv::{ +use yubikey::{ certificate::{Certificate, PublicKeyInfo}, - key::{decrypt_data, AlgorithmId, RetiredSlotId, SlotId}, - policy::PinPolicy, - readers::Reader, - yubikey::Serial, - MgmKey, Readers, YubiKey, + piv::{decrypt_data, AlgorithmId, RetiredSlotId, SlotId}, + reader::{Context, Reader}, + MgmKey, PinPolicy, Serial, YubiKey, }; use crate::{ @@ -56,11 +54,11 @@ pub(crate) fn filter_connected(reader: &Reader) -> bool { } } -pub(crate) fn wait_for_readers() -> Result { +pub(crate) fn wait_for_readers() -> Result { // Start a 15-second timer waiting for a YubiKey to be inserted (if necessary). let start = SystemTime::now(); loop { - let mut readers = Readers::open()?; + let mut readers = Context::open()?; if readers.iter()?.any(is_connected) { break Ok(readers); } @@ -73,7 +71,7 @@ pub(crate) fn wait_for_readers() -> Result { } pub(crate) fn open(serial: Option) -> Result { - if !Readers::open()?.iter()?.any(is_connected) { + if !Context::open()?.iter()?.any(is_connected) { if let Some(serial) = serial { eprintln!("⏳ Please insert the YubiKey with serial {}.", serial); } else { @@ -157,7 +155,7 @@ pub(crate) fn manage(yubikey: &mut YubiKey) -> Result<(), Error> { .map_err(|_| Error::CustomManagementKey)?; // Migrate to a PIN-protected management key. - let mgm_key = MgmKey::generate()?; + let mgm_key = MgmKey::generate(); eprintln!(); eprintln!("✨ Your YubiKey is using the default management key."); eprintln!("✨ We'll migrate it to a PIN-protected management key."); @@ -247,7 +245,7 @@ impl Stub { ) -> io::Result> { let mut yubikey = match YubiKey::open_by_serial(self.serial) { Ok(yk) => yk, - Err(yubikey_piv::Error::NotFound) => { + Err(yubikey::Error::NotFound) => { if callbacks .message(&format!( "Please insert YubiKey with serial {}", @@ -266,7 +264,7 @@ impl Stub { loop { match YubiKey::open_by_serial(self.serial) { Ok(yubikey) => break yubikey, - Err(yubikey_piv::Error::NotFound) => (), + Err(yubikey::Error::NotFound) => (), Err(_) => { return Ok(Err(identity::Error::Identity { index: self.identity_index, @@ -425,7 +423,7 @@ impl Connection { #[cfg(test)] mod tests { - use yubikey_piv::{key::RetiredSlotId, Serial}; + use yubikey::{piv::RetiredSlotId, Serial}; use super::Stub; diff --git a/src/main.rs b/src/main.rs index d2ed3be..cacae6e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,20 +5,20 @@ use std::io::{self, Write}; use age_plugin::run_state_machine; use dialoguer::{Confirm, Input, Select}; use gumdrop::Options; -use yubikey_piv::{ +use yubikey::{ certificate::PublicKeyInfo, - key::{RetiredSlotId, SlotId}, - policy::{PinPolicy, TouchPolicy}, - Key, Readers, Serial, + piv::{RetiredSlotId, SlotId}, + reader::Context, + Key, PinPolicy, Serial, TouchPolicy, }; mod builder; mod error; mod format; +mod key; mod p256; mod plugin; mod util; -mod yubikey; use error::Error; @@ -148,7 +148,7 @@ impl TryFrom for PluginFlags { } fn generate(flags: PluginFlags) -> Result<(), Error> { - let mut yubikey = yubikey::open(flags.serial)?; + let mut yubikey = key::open(flags.serial)?; let (stub, recipient, metadata) = builder::IdentityBuilder::new(flags.slot) .with_name(flags.name) @@ -165,9 +165,9 @@ fn generate(flags: PluginFlags) -> Result<(), Error> { fn print_single( serial: Option, slot: RetiredSlotId, - printer: impl Fn(yubikey::Stub, p256::Recipient, util::Metadata), + printer: impl Fn(key::Stub, p256::Recipient, util::Metadata), ) -> Result<(), Error> { - let mut yubikey = yubikey::open(serial)?; + let mut yubikey = key::open(serial)?; let mut keys = Key::list(&mut yubikey)?.into_iter().filter_map(|key| { // - We only use the retired slots. @@ -184,7 +184,7 @@ fn print_single( .find(|(_, s, _)| s == &slot) .ok_or(Error::SlotHasNoIdentity(slot))?; - let stub = yubikey::Stub::new(yubikey.serial(), slot, &recipient); + let stub = key::Stub::new(yubikey.serial(), slot, &recipient); let metadata = x509_parser::parse_x509_certificate(key.certificate().as_ref()) .ok() .and_then(|(_, cert)| util::Metadata::extract(&mut yubikey, slot, &cert, true)) @@ -199,12 +199,12 @@ fn print_multiple( kind: &str, serial: Option, all: bool, - printer: impl Fn(yubikey::Stub, p256::Recipient, util::Metadata), + printer: impl Fn(key::Stub, p256::Recipient, util::Metadata), ) -> Result<(), Error> { - let mut readers = Readers::open()?; + let mut readers = Context::open()?; let mut printed = 0; - for reader in readers.iter()?.filter(yubikey::filter_connected) { + for reader in readers.iter()?.filter(key::filter_connected) { let mut yubikey = reader.open()?; if let Some(serial) = serial { if yubikey.serial() != serial { @@ -228,7 +228,7 @@ fn print_multiple( _ => continue, }; - let stub = yubikey::Stub::new(yubikey.serial(), slot, &recipient); + let stub = key::Stub::new(yubikey.serial(), slot, &recipient); let metadata = match x509_parser::parse_x509_certificate(key.certificate().as_ref()) .ok() .and_then(|(_, cert)| util::Metadata::extract(&mut yubikey, slot, &cert, all)) @@ -257,7 +257,7 @@ fn print_details( kind: &str, flags: PluginFlags, all: bool, - printer: impl Fn(yubikey::Stub, p256::Recipient, util::Metadata), + printer: impl Fn(key::Stub, p256::Recipient, util::Metadata), ) -> Result<(), Error> { if let Some(slot) = flags.slot { print_single(flags.serial, slot, printer) @@ -350,13 +350,13 @@ fn main() -> Result<(), Error> { eprintln!("make your choice, or press [Esc] or [q] to quit."); eprintln!(); - if !Readers::open()?.iter()?.any(yubikey::is_connected) { + if !Context::open()?.iter()?.any(key::is_connected) { eprintln!("⏳ Please insert the YubiKey you want to set up."); }; - let mut readers = yubikey::wait_for_readers()?; + let mut readers = key::wait_for_readers()?; // Filter out readers we can't connect to. - let readers_list: Vec<_> = readers.iter()?.filter(yubikey::filter_connected).collect(); + let readers_list: Vec<_> = readers.iter()?.filter(key::filter_connected).collect(); let reader_names = readers_list .iter() @@ -447,7 +447,7 @@ fn main() -> Result<(), Error> { .with_prompt(&format!("Use existing identity in slot {}?", slot_index)) .interact()? { - let stub = yubikey::Stub::new(yubikey.serial(), slot, &recipient); + let stub = key::Stub::new(yubikey.serial(), slot, &recipient); let (_, cert) = x509_parser::parse_x509_certificate(key.certificate().as_ref()).unwrap(); let metadata = diff --git a/src/plugin.rs b/src/plugin.rs index 6c18f23..9dcef53 100644 --- a/src/plugin.rs +++ b/src/plugin.rs @@ -7,12 +7,12 @@ use age_plugin::{ use std::collections::HashMap; use std::io; -use crate::{format, p256::Recipient, yubikey, PLUGIN_NAME}; +use crate::{format, key, p256::Recipient, PLUGIN_NAME}; #[derive(Debug, Default)] pub(crate) struct RecipientPlugin { recipients: Vec, - yubikeys: Vec, + yubikeys: Vec, } impl RecipientPluginV1 for RecipientPlugin { @@ -44,7 +44,7 @@ impl RecipientPluginV1 for RecipientPlugin { bytes: &[u8], ) -> Result<(), recipient::Error> { if let Some(stub) = if plugin_name == PLUGIN_NAME { - yubikey::Stub::from_bytes(bytes, index) + key::Stub::from_bytes(bytes, index) } else { None } { @@ -100,7 +100,7 @@ impl RecipientPluginV1 for RecipientPlugin { #[derive(Debug, Default)] pub(crate) struct IdentityPlugin { - yubikeys: Vec, + yubikeys: Vec, } impl IdentityPluginV1 for IdentityPlugin { @@ -111,7 +111,7 @@ impl IdentityPluginV1 for IdentityPlugin { bytes: &[u8], ) -> Result<(), identity::Error> { if let Some(stub) = if plugin_name == PLUGIN_NAME { - yubikey::Stub::from_bytes(bytes, index) + key::Stub::from_bytes(bytes, index) } else { None } { @@ -133,14 +133,11 @@ impl IdentityPluginV1 for IdentityPlugin { let mut file_keys = HashMap::with_capacity(files.len()); // Filter to files / stanzas for which we have matching YubiKeys - let mut candidate_stanzas: Vec<( - &yubikey::Stub, - HashMap>, - )> = self - .yubikeys - .iter() - .map(|stub| (stub, HashMap::new())) - .collect(); + let mut candidate_stanzas: Vec<(&key::Stub, HashMap>)> = + self.yubikeys + .iter() + .map(|stub| (stub, HashMap::new())) + .collect(); for (file, stanzas) in files.iter().enumerate() { for (stanza_index, stanza) in stanzas.iter().enumerate() { diff --git a/src/util.rs b/src/util.rs index b8fb968..f83a252 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,13 +1,12 @@ use std::fmt; use x509_parser::{certificate::X509Certificate, der_parser::oid::Oid}; -use yubikey_piv::{ - key::{RetiredSlotId, SlotId}, - policy::{PinPolicy, TouchPolicy}, - Serial, YubiKey, +use yubikey::{ + piv::{RetiredSlotId, SlotId}, + PinPolicy, Serial, TouchPolicy, YubiKey, }; -use crate::{error::Error, p256::Recipient, yubikey::Stub, BINARY_NAME, USABLE_SLOTS}; +use crate::{error::Error, key::Stub, p256::Recipient, BINARY_NAME, USABLE_SLOTS}; pub(crate) const POLICY_EXTENSION_OID: &[u64] = &[1, 3, 6, 1, 4, 1, 41482, 3, 8]; @@ -111,8 +110,8 @@ impl Metadata { // using the same certificate extension as PIV attestations. // https://developers.yubico.com/PIV/Introduction/PIV_attestation.html let policies = |c: &X509Certificate| { - c.extensions() - .get(&Oid::from(POLICY_EXTENSION_OID).unwrap()) + c.tbs_certificate + .find_extension(&Oid::from(POLICY_EXTENSION_OID).unwrap()) // If the encoded extension doesn't have 2 bytes, we assume it is invalid. .filter(|policy| policy.value.len() >= 2) .map(|policy| { @@ -144,7 +143,7 @@ impl Metadata { // We can extract the PIN and touch policies via an attestation. This // is slow, but the user has asked for all compatible keys, so... let (pin_policy, touch_policy) = - yubikey_piv::key::attest(yubikey, SlotId::Retired(slot)) + yubikey::piv::attest(yubikey, SlotId::Retired(slot)) .ok() .and_then(|buf| { x509_parser::parse_x509_certificate(&buf)