From a09462f6b114e920f329b29ad62d6567b06607db Mon Sep 17 00:00:00 2001 From: Gowtham Suresh Kumar Date: Tue, 17 Oct 2023 09:08:27 +0100 Subject: [PATCH] Bump crates Signed-off-by: Gowtham Suresh Kumar --- Cargo.lock | 100 ++++++++--------------------------------- Cargo.toml | 6 +-- e2e_tests/Cargo.lock | 103 +++++++++++-------------------------------- e2e_tests/Cargo.toml | 8 ++-- fuzz/Cargo.lock | 88 +++++++++++++++--------------------- fuzz/Cargo.toml | 2 +- 6 files changed, 86 insertions(+), 221 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 736a1ab6..d0ae64af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,28 +119,6 @@ dependencies = [ "shlex 0.1.1", ] -[[package]] -name = "bindgen" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" -dependencies = [ - "bitflags 1.3.2", - "cexpr 0.6.0", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex 1.2.0", - "syn 1.0.109", - "which", -] - [[package]] name = "bindgen" version = "0.66.1" @@ -284,7 +262,7 @@ dependencies = [ "libloading", "log", "paste", - "secrecy 0.8.0", + "secrecy", ] [[package]] @@ -902,17 +880,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-derive" version = "0.4.1" @@ -1027,19 +994,19 @@ dependencies = [ [[package]] name = "parsec-interface" -version = "0.28.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f1b90789d4cabb8d7100a2ce632baad9683c2598f302d2387d9a45f967de56" +checksum = "cc706e09209b30f10baa35709d41b9cc01d4931b21c00679f59db96cd1650add" dependencies = [ "bincode", "derivative", "log", "num", - "num-derive 0.3.3", + "num-derive", "num-traits", - "prost 0.8.0", + "prost", "psa-crypto", - "secrecy 0.7.0", + "secrecy", "serde", "uuid", "zeroize", @@ -1064,7 +1031,7 @@ dependencies = [ "picky-asn1", "picky-asn1-der", "picky-asn1-x509", - "prost 0.9.0", + "prost", "prost-build", "psa-crypto", "rand", @@ -1241,16 +1208,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" -dependencies = [ - "bytes", - "prost-derive 0.8.0", -] - [[package]] name = "prost" version = "0.9.0" @@ -1258,7 +1215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", - "prost-derive 0.9.0", + "prost-derive", ] [[package]] @@ -1274,26 +1231,13 @@ dependencies = [ "log", "multimap", "petgraph", - "prost 0.9.0", + "prost", "prost-types", "regex", "tempfile", "which", ] -[[package]] -name = "prost-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "prost-derive" version = "0.9.0" @@ -1314,7 +1258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", - "prost 0.9.0", + "prost", ] [[package]] @@ -1325,9 +1269,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "psa-crypto" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31a7f20ebf21c7a53dd8aa24a11bd4cc9f3f838f0de1b32e17cb6cd4f88fdf7f" +checksum = "89c2256e525b9a45ec3bbb3382a43dd8809240279e0aab8ea7ee220e9295445b" dependencies = [ "log", "psa-crypto-sys", @@ -1337,13 +1281,14 @@ dependencies = [ [[package]] name = "psa-crypto-sys" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3f19716e0584f8d5627712617b1cc5b9b642943fd9a61b883b8d533f5d400c" +checksum = "f170cac3a328e1678916b276067ec170a5a51db1b9b8b4c00b44c2839819a963" dependencies = [ - "bindgen 0.63.0", + "bindgen 0.66.1", "cc", "cmake", + "regex", "walkdir", ] @@ -1539,22 +1484,13 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" -[[package]] -name = "secrecy" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0673d6a6449f5e7d12a1caf424fd9363e2af3a4953023ed455e3c4beef4597c0" -dependencies = [ - "serde", - "zeroize", -] - [[package]] name = "secrecy" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" dependencies = [ + "serde", "zeroize", ] @@ -1950,7 +1886,7 @@ dependencies = [ "hostname-validator", "log", "mbox", - "num-derive 0.4.1", + "num-derive", "num-traits", "oid", "picky-asn1", diff --git a/Cargo.toml b/Cargo.toml index c0ad063e..67b5011d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ name = "parsec" path = "src/bin/main.rs" [dependencies] -parsec-interface = "0.28.0" +parsec-interface = "0.29.1" rand = { version = "0.8.3", features = ["small_rng"], optional = true } base64 = "0.21.0" threadpool = "1.8.1" @@ -28,12 +28,12 @@ log = { version = "0.4.14", features = ["serde"] } cryptoki = { version = "0.6.0", optional = true, default-features = false } picky-asn1-der = { version = "0.4.0", optional = true } picky-asn1 = { version = "0.8.0", optional = true } -tss-esapi = { version = "7.3.0", optional = true } +tss-esapi = { version = "7.4.0", optional = true } bincode = "1.3.1" structopt = { version = "0.3.26", default-features = false} derivative = "2.2.0" hex = { version = "0.4.2", optional = true } -psa-crypto = { version = "0.10.0", default-features = false, features = ["operations"], optional = true } +psa-crypto = { version = "0.12.0", default-features = false, features = ["operations","std"], optional = true } zeroize = { version = "1.2.0", features = ["zeroize_derive"] } picky-asn1-x509 = { version = "0.12.0", optional = true } libc = "0.2.86" diff --git a/e2e_tests/Cargo.lock b/e2e_tests/Cargo.lock index 13bc7936..3abf1ce1 100644 --- a/e2e_tests/Cargo.lock +++ b/e2e_tests/Cargo.lock @@ -261,7 +261,7 @@ dependencies = [ "libloading", "log", "paste", - "secrecy 0.8.0", + "secrecy", ] [[package]] @@ -349,9 +349,9 @@ dependencies = [ "log", "num_cpus", "parsec-client", - "picky-asn1 0.7.2", + "picky-asn1", "picky-asn1-der", - "picky-asn1-x509 0.11.0", + "picky-asn1-x509", "rand", "regex", "ring", @@ -872,17 +872,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-derive" version = "0.4.1" @@ -1003,35 +992,35 @@ dependencies = [ [[package]] name = "parsec-client" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5798ac04b102b074ad2a26976e53e4c918d2342ccb8ce6f31c2e71ab338b1156" +checksum = "a36f9d8e27166cf0586913812454174286e094d594cc8b28d8a8d02d64406bbc" dependencies = [ "derivative", + "libc", "log", "num", "parsec-interface", "spiffe", "url", - "users", "zeroize", ] [[package]] name = "parsec-interface" -version = "0.28.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f1b90789d4cabb8d7100a2ce632baad9683c2598f302d2387d9a45f967de56" +checksum = "cc706e09209b30f10baa35709d41b9cc01d4931b21c00679f59db96cd1650add" dependencies = [ "bincode", "derivative", "log", "num", - "num-derive 0.3.3", + "num-derive", "num-traits", "prost", "psa-crypto", - "secrecy 0.7.0", + "secrecy", "serde", "uuid", "zeroize", @@ -1086,17 +1075,6 @@ dependencies = [ "ucd-trie", ] -[[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" version = "0.8.0" @@ -1114,24 +1092,11 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5df7873a9e36d42dadb393bea5e211fe83d793c172afad5fb4ec846ec582793f" dependencies = [ - "picky-asn1 0.8.0", + "picky-asn1", "serde", "serde_bytes", ] -[[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.4", - "oid", - "picky-asn1 0.7.2", - "picky-asn1-der", - "serde", -] - [[package]] name = "picky-asn1-x509" version = "0.12.0" @@ -1140,7 +1105,7 @@ checksum = "2c5f20f71a68499ff32310f418a6fad8816eac1a2859ed3f0c5c741389dd6208" dependencies = [ "base64 0.21.4", "oid", - "picky-asn1 0.8.0", + "picky-asn1", "picky-asn1-der", "serde", ] @@ -1190,9 +1155,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", "prost-derive", @@ -1200,9 +1165,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", "itertools", @@ -1219,9 +1184,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "psa-crypto" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31a7f20ebf21c7a53dd8aa24a11bd4cc9f3f838f0de1b32e17cb6cd4f88fdf7f" +checksum = "89c2256e525b9a45ec3bbb3382a43dd8809240279e0aab8ea7ee220e9295445b" dependencies = [ "log", "psa-crypto-sys", @@ -1231,12 +1196,13 @@ dependencies = [ [[package]] name = "psa-crypto-sys" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3f19716e0584f8d5627712617b1cc5b9b642943fd9a61b883b8d533f5d400c" +checksum = "f170cac3a328e1678916b276067ec170a5a51db1b9b8b4c00b44c2839819a963" dependencies = [ "cc", "cmake", + "regex", "walkdir", ] @@ -1423,22 +1389,13 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "secrecy" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0673d6a6449f5e7d12a1caf424fd9363e2af3a4953023ed455e3c4beef4597c0" -dependencies = [ - "serde", - "zeroize", -] - [[package]] name = "secrecy" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" dependencies = [ + "serde", "zeroize", ] @@ -1767,11 +1724,11 @@ dependencies = [ "hostname-validator", "log", "mbox", - "num-derive 0.4.1", + "num-derive", "num-traits", "oid", - "picky-asn1 0.8.0", - "picky-asn1-x509 0.12.0", + "picky-asn1", + "picky-asn1-x509", "regex", "serde", "tss-esapi-sys", @@ -1850,16 +1807,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "users" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" -dependencies = [ - "libc", - "log", -] - [[package]] name = "uuid" version = "0.8.2" diff --git a/e2e_tests/Cargo.toml b/e2e_tests/Cargo.toml index bbd943ec..61b08ad8 100644 --- a/e2e_tests/Cargo.toml +++ b/e2e_tests/Cargo.toml @@ -11,22 +11,22 @@ publish = false [dependencies] serde = { version = "1.0.123", features = ["derive"] } -parsec-client = { version = "0.15.0", features = ["testing", "spiffe-auth"] } +parsec-client = { version = "0.16.0", features = ["testing", "spiffe-auth"] } log = "0.4.14" # Compatible version with crate rsa rand = "0.7.3" env_logger = "0.10.0" stdext = "0.3.1" -tss-esapi = { version = "7.3.0", optional = true } +tss-esapi = { version = "7.4.0", optional = true } [dev-dependencies] ring = "0.16.20" rsa = "0.3.0" -picky-asn1-x509 = "0.11.0" +picky-asn1-x509 = "0.12.0" base64 = "0.21.0" num_cpus = "1.13.0" picky-asn1-der = "0.4.0" -picky-asn1 = "0.7.2" +picky-asn1 = "0.8.0" sha2 = "0.9.3" serial_test = "0.5.1" regex = "1.6.0" diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 5982748f..1685655b 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -145,23 +145,24 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.63.0" +version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cexpr 0.6.0", "clang-sys", "lazy_static", "lazycell", "log", "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex 1.2.0", - "syn 1.0.109", + "syn 2.0.38", "which", ] @@ -296,7 +297,7 @@ dependencies = [ "libloading", "log", "paste", - "secrecy 0.8.0", + "secrecy", ] [[package]] @@ -953,17 +954,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-derive" version = "0.4.1" @@ -1078,17 +1068,17 @@ dependencies = [ [[package]] name = "parsec-client" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5798ac04b102b074ad2a26976e53e4c918d2342ccb8ce6f31c2e71ab338b1156" +checksum = "a36f9d8e27166cf0586913812454174286e094d594cc8b28d8a8d02d64406bbc" dependencies = [ "derivative", + "libc", "log", "num", "parsec-interface", "spiffe", "url", - "users", "zeroize", ] @@ -1108,19 +1098,19 @@ dependencies = [ [[package]] name = "parsec-interface" -version = "0.28.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f1b90789d4cabb8d7100a2ce632baad9683c2598f302d2387d9a45f967de56" +checksum = "cc706e09209b30f10baa35709d41b9cc01d4931b21c00679f59db96cd1650add" dependencies = [ "bincode", "derivative", "log", "num", - "num-derive 0.3.3", + "num-derive", "num-traits", "prost", "psa-crypto", - "secrecy 0.7.0", + "secrecy", "serde", "uuid", "zeroize", @@ -1264,6 +1254,16 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "prettyplease" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +dependencies = [ + "proc-macro2", + "syn 2.0.38", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -1299,9 +1299,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", "prost-derive", @@ -1309,9 +1309,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", "itertools", @@ -1328,9 +1328,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "psa-crypto" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31a7f20ebf21c7a53dd8aa24a11bd4cc9f3f838f0de1b32e17cb6cd4f88fdf7f" +checksum = "89c2256e525b9a45ec3bbb3382a43dd8809240279e0aab8ea7ee220e9295445b" dependencies = [ "log", "psa-crypto-sys", @@ -1340,13 +1340,14 @@ dependencies = [ [[package]] name = "psa-crypto-sys" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3f19716e0584f8d5627712617b1cc5b9b642943fd9a61b883b8d533f5d400c" +checksum = "f170cac3a328e1678916b276067ec170a5a51db1b9b8b4c00b44c2839819a963" dependencies = [ - "bindgen 0.63.0", + "bindgen 0.66.1", "cc", "cmake", + "regex", "walkdir", ] @@ -1520,22 +1521,13 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" -[[package]] -name = "secrecy" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0673d6a6449f5e7d12a1caf424fd9363e2af3a4953023ed455e3c4beef4597c0" -dependencies = [ - "serde", - "zeroize", -] - [[package]] name = "secrecy" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" dependencies = [ + "serde", "zeroize", ] @@ -1906,7 +1898,7 @@ dependencies = [ "hostname-validator", "log", "mbox", - "num-derive 0.4.1", + "num-derive", "num-traits", "oid", "picky-asn1", @@ -1995,16 +1987,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "users" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" -dependencies = [ - "libc", - "log", -] - [[package]] name = "uuid" version = "0.8.2" diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 8a92f661..d6d19d46 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -20,7 +20,7 @@ lazy_static = "1.4.0" arbitrary = { version = "0.4.0", features = ["derive"] } [build-dependencies] -parsec-client = { version = "0.15.0", features = ["testing", "spiffe-auth"] } +parsec-client = { version = "0.16.0", features = ["testing", "spiffe-auth"] } # Prevent this from interfering with workspaces [workspace]