From 9fe11ad5bb1ebf55c2fc2783a6783c9fbaacfee7 Mon Sep 17 00:00:00 2001 From: Jiaqi Gao Date: Thu, 5 Sep 2024 22:46:45 -0400 Subject: [PATCH] Cargo.lock: upgrade dependencies Upgrade dependency to remove yanked version. Version of `log` is locked becasue the latest version checks the log level but we get conflict level with `deps/td-shim/td-logger`. It will be unlocked once the conflict is fixed. Signed-off-by: Jiaqi Gao --- Cargo.lock | 25 +++++++++++++++++-------- src/migtd/Cargo.toml | 2 +- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aa836bb..b31c162 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -177,6 +177,12 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.0" @@ -269,7 +275,7 @@ dependencies = [ name = "crypto" version = "0.1.0" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "der 0.5.1", "ring", "rust_std_stub", @@ -427,7 +433,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "wasi", ] @@ -548,9 +554,12 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" +dependencies = [ + "cfg-if 0.1.10", +] [[package]] name = "memchr" @@ -829,7 +838,7 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.22.0" dependencies = [ "ring", "rust_std_stub", @@ -959,7 +968,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest", ] @@ -1176,7 +1185,7 @@ dependencies = [ "argparse", "block-padding", "byteorder", - "cfg-if", + "cfg-if 1.0.0", "clap", "der 0.4.5", "env_logger", @@ -1346,7 +1355,7 @@ version = "0.1.0" dependencies = [ "atomic_refcell", "byteorder", - "cfg-if", + "cfg-if 1.0.0", "conquer-once", "lazy_static", "log", diff --git a/src/migtd/Cargo.toml b/src/migtd/Cargo.toml index df90658..d4c01e6 100644 --- a/src/migtd/Cargo.toml +++ b/src/migtd/Cargo.toml @@ -15,7 +15,7 @@ attestation = { path = "../attestation", default-features = false, optional = tr cc-measurement = { path = "../../deps/td-shim/cc-measurement"} crypto = { path = "../crypto" } lazy_static = { version = "1.0", features = ["spin_no_std"] } -log = { version = "0.4.13" } +log = { version = "=0.4.13" } pci = { path="../devices/pci" } policy = {path = "../policy"} rust_std_stub = { path = "../std-support/rust-std-stub" }