diff --git a/Cargo.lock b/Cargo.lock index c2fc3d0f2b..7c00ea8f7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -422,6 +422,12 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + [[package]] name = "cargo-emit" version = "0.1.1" @@ -630,7 +636,7 @@ dependencies = [ "clap", "criterion-plot", "csv", - "itertools", + "itertools 0.9.0", "lazy_static", "num-traits", "oorandom", @@ -651,7 +657,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddeaf7989f00f2e1d871a26a110f3ed713632feac17f65f03ca938c542618b60" dependencies = [ "cast", - "itertools", + "itertools 0.9.0", ] [[package]] @@ -1817,6 +1823,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.5" @@ -2036,7 +2051,7 @@ dependencies = [ "mc-util-serial", "mc-util-test-helper", "mc-util-test-vectors", - "prost", + "prost 0.6.1", "rand 0.7.3", "rand_core 0.5.1", "rand_hc 0.2.0", @@ -2099,7 +2114,7 @@ dependencies = [ "mc-util-repr-bytes", "mc-util-serial", "mc-util-test-helper", - "prost", + "prost 0.6.1", "protobuf", "rand 0.7.3", ] @@ -2122,7 +2137,7 @@ dependencies = [ "mc-util-build-sgx", "mc-util-encodings", "mc-util-from-random", - "prost", + "prost 0.6.1", "rand_core 0.5.1", "rand_hc 0.2.0", "serde", @@ -2173,7 +2188,7 @@ dependencies = [ "mc-util-encodings", "mc-util-serial", "pem", - "prost", + "prost 0.6.1", "rand 0.7.3", "rand_core 0.5.1", "rand_hc 0.2.0", @@ -2223,7 +2238,7 @@ dependencies = [ "mc-common", "mc-sgx-compat", "mc-sgx-types", - "prost", + "prost 0.6.1", ] [[package]] @@ -2410,7 +2425,7 @@ dependencies = [ "mc-util-build-script", "mc-util-from-random", "mc-util-serial", - "prost", + "prost 0.6.1", "rand 0.7.3", "rand_core 0.5.1", "rand_hc 0.2.0", @@ -2534,7 +2549,7 @@ dependencies = [ "mc-util-serial", "mc-util-uri", "mockall", - "prost", + "prost 0.6.1", "protobuf", "rand 0.7.3", "rand_core 0.5.1", @@ -2659,7 +2674,7 @@ dependencies = [ "mc-util-serial", "mc-util-test-helper", "pem", - "prost", + "prost 0.6.1", "rand_core 0.5.1", "rand_hc 0.2.0", "semver", @@ -2763,7 +2778,7 @@ dependencies = [ "mc-util-metrics", "mc-util-serial", "mockall", - "prost", + "prost 0.6.1", "rand 0.7.3", "rand_core 0.5.1", "serde", @@ -2887,7 +2902,7 @@ dependencies = [ "mc-watcher", "more-asserts", "num_cpus", - "prost", + "prost 0.6.1", "protobuf", "rand 0.7.3", "rand_core 0.5.1", @@ -3040,7 +3055,7 @@ dependencies = [ "mc-sgx-core-types-sys", "mc-util-encodings", "mc-util-repr-bytes", - "prost", + "prost 0.6.1", "serde", "subtle 2.2.3", ] @@ -3110,7 +3125,7 @@ dependencies = [ "mc-util-encodings", "mc-util-from-random", "mc-util-repr-bytes", - "prost", + "prost 0.6.1", "rand_core 0.5.1", "rand_hc 0.2.0", "serde", @@ -3147,7 +3162,7 @@ dependencies = [ "mc-util-encodings", "mc-util-from-random", "mc-util-repr-bytes", - "prost", + "prost 0.6.1", "prost-types", "rand_core 0.5.1", "rand_hc 0.2.0", @@ -3200,7 +3215,7 @@ dependencies = [ "cfg-if", "mc-common", "mc-sgx-build", - "prost", + "prost 0.6.1", ] [[package]] @@ -3224,7 +3239,7 @@ dependencies = [ "mc-sgx-libc-types", "mc-sgx-slog", "mc-sgx-types", - "prost", + "prost 0.6.1", "rustc-demangle", ] @@ -3290,7 +3305,7 @@ dependencies = [ "mc-util-test-helper", "merlin", "proptest", - "prost", + "prost 0.6.1", "rand 0.7.3", "rand_core 0.5.1", "rand_hc 0.2.0", @@ -3333,7 +3348,7 @@ dependencies = [ "mc-util-from-random", "mc-util-serial", "mc-util-test-helper", - "prost", + "prost 0.6.1", "rand 0.7.3", "rand_core 0.5.1", "serde", @@ -3470,7 +3485,7 @@ dependencies = [ "mc-util-serial", "mc-util-uri", "prometheus", - "prost", + "prost 0.6.1", "protobuf", "rand 0.6.5", ] @@ -3503,7 +3518,7 @@ dependencies = [ "displaydoc", "lmdb-rkv", "mc-util-serial", - "prost", + "prost 0.6.1", ] [[package]] @@ -3550,7 +3565,7 @@ name = "mc-util-repr-bytes" version = "1.0.0" dependencies = [ "generic-array 0.14.4", - "prost", + "prost 0.6.1", "serde", "serde_cbor", ] @@ -3559,7 +3574,7 @@ dependencies = [ name = "mc-util-serial" version = "1.0.0" dependencies = [ - "prost", + "prost 0.6.1", "serde", "serde_cbor", ] @@ -3568,7 +3583,7 @@ dependencies = [ name = "mc-util-test-helper" version = "1.0.0" dependencies = [ - "itertools", + "itertools 0.9.0", "lazy_static", "mc-account-keys", "mc-common", @@ -3645,7 +3660,7 @@ dependencies = [ "mc-util-serial", "mc-util-test-helper", "mc-watcher-api", - "prost", + "prost 0.6.1", "rand_core 0.5.1", "rand_hc 0.2.0", "structopt", @@ -4270,7 +4285,17 @@ version = "0.6.1" source = "git+https://github.com/danburkert/prost?rev=6113789f70b69709820becba4242824b4fb3ffec#6113789f70b69709820becba4242824b4fb3ffec" dependencies = [ "bytes 0.5.4", - "prost-derive", + "prost-derive 0.6.1", +] + +[[package]] +name = "prost" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" +dependencies = [ + "bytes 1.1.0", + "prost-derive 0.8.0", ] [[package]] @@ -4279,7 +4304,20 @@ version = "0.6.1" source = "git+https://github.com/danburkert/prost?rev=6113789f70b69709820becba4242824b4fb3ffec#6113789f70b69709820becba4242824b4fb3ffec" dependencies = [ "anyhow", - "itertools", + "itertools 0.9.0", + "proc-macro2 1.0.12", + "quote 1.0.4", + "syn 1.0.18", +] + +[[package]] +name = "prost-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" +dependencies = [ + "anyhow", + "itertools 0.10.3", "proc-macro2 1.0.12", "quote 1.0.4", "syn 1.0.18", @@ -4287,12 +4325,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.6.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa" +checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" dependencies = [ - "bytes 0.5.4", - "prost", + "bytes 1.1.0", + "prost 0.8.0", ] [[package]] diff --git a/sgx/ias-types/Cargo.toml b/sgx/ias-types/Cargo.toml index cd7da4bcb8..6338a2fbc3 100644 --- a/sgx/ias-types/Cargo.toml +++ b/sgx/ias-types/Cargo.toml @@ -38,7 +38,7 @@ typenum = { version = "1.12", features = ["no_std"] } hex = { version = "0.4", default-features = false } hex_fmt = "0.3" prost = { version = "0.6.1", optional = true, default-features = false } -prost-types = { version = "0.6.1", optional = true, default-features = false } +prost-types = { version = "0.8.0", optional = true, default-features = false } rand_core = "0.5" rjson = "0.3" subtle = { version = "2.2", default-features = false, features = ["i128"] }