diff --git a/Cargo.lock b/Cargo.lock index ad231131..1ea7acd5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,6 +90,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + [[package]] name = "bincode" version = "1.3.3" @@ -687,7 +693,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c57c852b14147e2bd58c14fde40398864453403ef632b1101db130282ee6e2cc" dependencies = [ - "base64", + "base64 0.13.1", "bitflags", "generic-array", "jsonwebtoken", @@ -705,7 +711,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828" dependencies = [ - "base64", + "base64 0.13.1", "pem", "ring", "serde", @@ -1019,7 +1025,7 @@ name = "parsec-service" version = "1.2.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "bincode", "bindgen 0.63.0", "cryptoki", @@ -1030,9 +1036,9 @@ dependencies = [ "log", "num-traits", "parsec-interface", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", + "picky-asn1 0.7.2", + "picky-asn1-der 0.4.0", + "picky-asn1-x509 0.11.0", "prost", "prost-build", "psa-crypto", @@ -1063,7 +1069,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -1103,13 +1109,35 @@ dependencies = [ "serde_bytes", ] +[[package]] +name = "picky-asn1" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f338f1fd4f3e13e75e986ca29f2a3c62528d88d3cbadf4afdcefb6b087f2d32" +dependencies = [ + "oid", + "serde", + "serde_bytes", +] + [[package]] name = "picky-asn1-der" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbbd5390ab967396cc7473e6e0848684aec7166e657c6088604e07b54a73dbe" dependencies = [ - "picky-asn1", + "picky-asn1 0.3.3", + "serde", + "serde_bytes", +] + +[[package]] +name = "picky-asn1-der" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e47267a46f4ea246b772381970b8ed3f15963dd3e15ffc2c3f4ac3bc2d77384b" +dependencies = [ + "picky-asn1 0.7.2", "serde", "serde_bytes", ] @@ -1120,10 +1148,23 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3033675030de806aba1d5470949701b7c9f1dbf77e3bb17bd12e5f945e560ba" dependencies = [ - "base64", + "base64 0.13.1", + "oid", + "picky-asn1 0.3.3", + "picky-asn1-der 0.2.5", + "serde", +] + +[[package]] +name = "picky-asn1-x509" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25c2718a5fe2b6c4b651bad5514699182f01db1b2f256fd6ab237f5879a01a4a" +dependencies = [ + "base64 0.21.2", "oid", - "picky-asn1", - "picky-asn1-der", + "picky-asn1 0.7.2", + "picky-asn1-der 0.4.0", "serde", ] @@ -1808,8 +1849,8 @@ dependencies = [ "num-derive", "num-traits", "oid", - "picky-asn1", - "picky-asn1-x509", + "picky-asn1 0.3.3", + "picky-asn1-x509 0.6.1", "regex", "serde", "tss-esapi-sys", @@ -2123,7 +2164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" dependencies = [ "asn1-rs", - "base64", + "base64 0.13.1", "data-encoding", "der-parser", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index 08e4bd1e..2790cd7d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,8 +27,8 @@ serde = { version = "1.0.123", features = ["derive"] } env_logger = "0.8.3" log = { version = "0.4.14", features = ["serde"] } cryptoki = { version = "0.3.1", optional = true, features = ["psa-crypto-conversions"] } -picky-asn1-der = { version = "0.2.4", optional = true } -picky-asn1 = { version = "0.3.0", optional = true } +picky-asn1-der = { version = "0.4.0", optional = true } +picky-asn1 = { version = "0.7.2", optional = true } tss-esapi = { version = "7.2.0", optional = true } bincode = "1.3.1" structopt = { version = "0.3.21", default-features = false} @@ -36,7 +36,7 @@ derivative = "2.2.0" hex = { version = "0.4.2", optional = true } psa-crypto = { version = "0.10.0", default-features = false, features = ["operations"], optional = true } zeroize = { version = "1.2.0", features = ["zeroize_derive"] } -picky-asn1-x509 = { version = "0.6.1", optional = true } +picky-asn1-x509 = { version = "0.11.0", optional = true } libc = "0.2.86" anyhow = "1.0.38" rust-cryptoauthlib = { version = "0.4.4", optional = true } diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 2adcccd0..3046f10c 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -31,15 +31,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anyhow" version = "1.0.64" @@ -79,7 +70,7 @@ checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", "synstructure", ] @@ -91,7 +82,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -113,9 +104,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bincode" @@ -163,7 +160,7 @@ dependencies = [ "regex", "rustc-hash", "shlex 1.1.0", - "syn", + "syn 1.0.99", "which", ] @@ -253,13 +250,9 @@ version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "ansi_term", - "atty", "bitflags", - "strsim", "textwrap", "unicode-width", - "vec_map", ] [[package]] @@ -343,7 +336,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -354,7 +347,7 @@ checksum = "b1a012b5e473dc912f0db0546a1c9c6a194ce8494feb66fa0237160926f9e0e6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -365,7 +358,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -391,7 +384,7 @@ checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -498,7 +491,7 @@ checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -705,7 +698,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c57c852b14147e2bd58c14fde40398864453403ef632b1101db130282ee6e2cc" dependencies = [ - "base64", + "base64 0.13.1", "bitflags", "generic-array", "jsonwebtoken", @@ -723,7 +716,7 @@ version = "8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aa4b4af834c6cfd35d8763d359661b90f2e45d8f750a0849156c7f4671af09c" dependencies = [ - "base64", + "base64 0.13.1", "pem", "ring", "serde", @@ -903,7 +896,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1068,10 +1061,10 @@ dependencies = [ [[package]] name = "parsec-service" -version = "1.1.0" +version = "1.2.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "bincode", "cryptoki", "derivative", @@ -1081,9 +1074,9 @@ dependencies = [ "log", "num-traits", "parsec-interface", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", + "picky-asn1 0.7.2", + "picky-asn1-der 0.4.0", + "picky-asn1-x509 0.11.0", "psa-crypto", "rand", "rusqlite", @@ -1094,7 +1087,6 @@ dependencies = [ "threadpool", "toml 0.5.9", "tss-esapi", - "users", "uuid", "zeroize", ] @@ -1111,7 +1103,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -1141,13 +1133,35 @@ dependencies = [ "serde_bytes", ] +[[package]] +name = "picky-asn1" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f338f1fd4f3e13e75e986ca29f2a3c62528d88d3cbadf4afdcefb6b087f2d32" +dependencies = [ + "oid", + "serde", + "serde_bytes", +] + [[package]] name = "picky-asn1-der" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbbd5390ab967396cc7473e6e0848684aec7166e657c6088604e07b54a73dbe" dependencies = [ - "picky-asn1", + "picky-asn1 0.3.3", + "serde", + "serde_bytes", +] + +[[package]] +name = "picky-asn1-der" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e47267a46f4ea246b772381970b8ed3f15963dd3e15ffc2c3f4ac3bc2d77384b" +dependencies = [ + "picky-asn1 0.7.2", "serde", "serde_bytes", ] @@ -1158,10 +1172,23 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3033675030de806aba1d5470949701b7c9f1dbf77e3bb17bd12e5f945e560ba" dependencies = [ - "base64", + "base64 0.13.1", "oid", - "picky-asn1", - "picky-asn1-der", + "picky-asn1 0.3.3", + "picky-asn1-der 0.2.5", + "serde", +] + +[[package]] +name = "picky-asn1-x509" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25c2718a5fe2b6c4b651bad5514699182f01db1b2f256fd6ab237f5879a01a4a" +dependencies = [ + "base64 0.21.2", + "oid", + "picky-asn1 0.7.2", + "picky-asn1-der 0.4.0", "serde", ] @@ -1208,7 +1235,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.99", "version_check", ] @@ -1225,9 +1252,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -1252,7 +1279,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1287,9 +1314,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1460,31 +1487,31 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.144" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.144" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" +checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] @@ -1599,12 +1626,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "structopt" version = "0.3.26" @@ -1626,7 +1647,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1640,6 +1661,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "synstructure" version = "0.12.6" @@ -1648,7 +1680,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", "unicode-xid", ] @@ -1693,7 +1725,7 @@ checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1781,8 +1813,8 @@ dependencies = [ "num-derive", "num-traits", "oid", - "picky-asn1", - "picky-asn1-x509", + "picky-asn1 0.3.3", + "picky-asn1-x509 0.6.1", "regex", "serde", "tss-esapi-sys", @@ -1890,12 +1922,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.4" @@ -1946,7 +1972,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.99", "wasm-bindgen-shared", ] @@ -1968,7 +1994,7 @@ checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2038,7 +2064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" dependencies = [ "asn1-rs", - "base64", + "base64 0.13.1", "data-encoding", "der-parser", "lazy_static", @@ -2081,6 +2107,6 @@ checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", "synstructure", ]