diff --git a/Cargo.lock b/Cargo.lock index 736a1ab6..64927ba5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -284,7 +284,7 @@ dependencies = [ "libloading", "log", "paste", - "secrecy 0.8.0", + "secrecy", ] [[package]] @@ -902,17 +902,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 +1016,19 @@ dependencies = [ [[package]] name = "parsec-interface" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f1b90789d4cabb8d7100a2ce632baad9683c2598f302d2387d9a45f967de56" +checksum = "0cdfb8fbec0cc9a03ec4a9a15ac7728c6502daf7fcccae96990bd8240809c78a" dependencies = [ "bincode", "derivative", "log", "num", - "num-derive 0.3.3", + "num-derive", "num-traits", - "prost 0.8.0", - "psa-crypto", - "secrecy 0.7.0", + "prost", + "psa-crypto 0.11.0", + "secrecy", "serde", "uuid", "zeroize", @@ -1064,9 +1053,9 @@ dependencies = [ "picky-asn1", "picky-asn1-der", "picky-asn1-x509", - "prost 0.9.0", + "prost", "prost-build", - "psa-crypto", + "psa-crypto 0.10.0", "rand", "rusqlite", "rust-cryptoauthlib", @@ -1241,16 +1230,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 +1237,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 +1253,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 +1280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", - "prost 0.9.0", + "prost", ] [[package]] @@ -1330,7 +1296,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31a7f20ebf21c7a53dd8aa24a11bd4cc9f3f838f0de1b32e17cb6cd4f88fdf7f" dependencies = [ "log", - "psa-crypto-sys", + "psa-crypto-sys 0.10.0", + "serde", + "zeroize", +] + +[[package]] +name = "psa-crypto" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc6d5483e7d002ed1cc1e326ede9762cf2e9adcde0dbc36a926e8087694735a" +dependencies = [ + "log", + "psa-crypto-sys 0.11.0", "serde", "zeroize", ] @@ -1347,6 +1325,18 @@ dependencies = [ "walkdir", ] +[[package]] +name = "psa-crypto-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2be6a4212e526dda25f29cbe2b0d6879709ca62c826a0c569e77841f5f023e" +dependencies = [ + "cc", + "cmake", + "regex", + "walkdir", +] + [[package]] name = "quote" version = "1.0.33" @@ -1539,22 +1529,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 +1931,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..882dd9c3 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.0" rand = { version = "0.8.3", features = ["small_rng"], optional = true } base64 = "0.21.0" threadpool = "1.8.1" diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 5982748f..22a117e8 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -1085,7 +1085,7 @@ dependencies = [ "derivative", "log", "num", - "parsec-interface", + "parsec-interface 0.28.0", "spiffe", "url", "users", @@ -1118,14 +1118,34 @@ dependencies = [ "num", "num-derive 0.3.3", "num-traits", - "prost", - "psa-crypto", + "prost 0.8.0", + "psa-crypto 0.10.0", "secrecy 0.7.0", "serde", "uuid", "zeroize", ] +[[package]] +name = "parsec-interface" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cdfb8fbec0cc9a03ec4a9a15ac7728c6502daf7fcccae96990bd8240809c78a" +dependencies = [ + "bincode", + "derivative", + "log", + "num", + "num-derive 0.4.1", + "num-traits", + "prost 0.9.0", + "psa-crypto 0.11.0", + "secrecy 0.8.0", + "serde", + "uuid", + "zeroize", +] + [[package]] name = "parsec-service" version = "1.2.0" @@ -1140,11 +1160,11 @@ dependencies = [ "libc", "log", "num-traits", - "parsec-interface", + "parsec-interface 0.29.0", "picky-asn1", "picky-asn1-der", "picky-asn1-x509", - "psa-crypto", + "psa-crypto 0.10.0", "rand", "rusqlite", "sd-notify", @@ -1304,7 +1324,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.8.0", +] + +[[package]] +name = "prost" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +dependencies = [ + "bytes", + "prost-derive 0.9.0", ] [[package]] @@ -1320,6 +1350,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "prost-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "protobuf" version = "2.28.0" @@ -1333,7 +1376,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31a7f20ebf21c7a53dd8aa24a11bd4cc9f3f838f0de1b32e17cb6cd4f88fdf7f" dependencies = [ "log", - "psa-crypto-sys", + "psa-crypto-sys 0.10.0", + "serde", + "zeroize", +] + +[[package]] +name = "psa-crypto" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc6d5483e7d002ed1cc1e326ede9762cf2e9adcde0dbc36a926e8087694735a" +dependencies = [ + "log", + "psa-crypto-sys 0.11.0", "serde", "zeroize", ] @@ -1350,6 +1405,18 @@ dependencies = [ "walkdir", ] +[[package]] +name = "psa-crypto-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2be6a4212e526dda25f29cbe2b0d6879709ca62c826a0c569e77841f5f023e" +dependencies = [ + "cc", + "cmake", + "regex", + "walkdir", +] + [[package]] name = "quote" version = "1.0.33" @@ -1536,6 +1603,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" dependencies = [ + "serde", "zeroize", ]