From ebe87408ffbaab7628b8ad09feed11cf0fc8ee6e Mon Sep 17 00:00:00 2001 From: Xynnn007 Date: Mon, 25 Nov 2024 11:21:37 +0800 Subject: [PATCH] Cargo.toml: Update kbs_protocol crate to align with new JWE Signed-off-by: Xynnn007 --- Cargo.lock | 97 ++++++++++++++++++++++++++++++++++-------------------- Cargo.toml | 16 ++++++--- 2 files changed, 72 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26de0e826..73b0d936f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -507,11 +507,11 @@ source = "git+https://github.com/confidential-containers/guest-components.git?re dependencies = [ "anyhow", "async-trait", - "attester", + "attester 0.1.0 (git+https://github.com/confidential-containers/guest-components.git?rev=e6999a3c0fd877dae9e68ea78b8b483062db32b8)", "base64 0.22.1", "config", "const_format", - "crypto", + "crypto 0.1.0 (git+https://github.com/confidential-containers/guest-components.git?rev=e6999a3c0fd877dae9e68ea78b8b483062db32b8)", "kbs-types", "log", "serde", @@ -568,7 +568,7 @@ dependencies = [ [[package]] name = "attester" version = "0.1.0" -source = "git+https://github.com/confidential-containers/guest-components.git?rev=e6999a3c0fd877dae9e68ea78b8b483062db32b8#e6999a3c0fd877dae9e68ea78b8b483062db32b8" +source = "git+https://github.com/Xynnn007/guest-components.git?rev=2bfe3559bf273ddc835817498843f49c85359bbf#2bfe3559bf273ddc835817498843f49c85359bbf" dependencies = [ "anyhow", "async-trait", @@ -588,7 +588,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "sev 3.1.1", + "sev", "sha2", "strum 0.26.3", "tdx-attest-rs", @@ -597,6 +597,25 @@ dependencies = [ "tokio", ] +[[package]] +name = "attester" +version = "0.1.0" +source = "git+https://github.com/confidential-containers/guest-components.git?rev=e6999a3c0fd877dae9e68ea78b8b483062db32b8#e6999a3c0fd877dae9e68ea78b8b483062db32b8" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.22.1", + "hex", + "kbs-types", + "log", + "serde", + "serde_json", + "serde_with", + "sha2", + "strum 0.26.3", + "thiserror 2.0.3", +] + [[package]] name = "atty" version = "0.2.14" @@ -719,7 +738,7 @@ dependencies = [ "serde", "serde-big-array", "serde_json", - "sev 4.0.0", + "sev", "sha2", "thiserror 2.0.3", "tss-esapi", @@ -737,7 +756,7 @@ dependencies = [ "clap 4.5.20", "openssl", "serde", - "sev 4.0.0", + "sev", "thiserror 2.0.3", "ureq", ] @@ -1356,6 +1375,25 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto" +version = "0.1.0" +source = "git+https://github.com/Xynnn007/guest-components.git?rev=2bfe3559bf273ddc835817498843f49c85359bbf#2bfe3559bf273ddc835817498843f49c85359bbf" +dependencies = [ + "aes-gcm", + "anyhow", + "base64 0.22.1", + "ctr", + "kbs-types", + "rand", + "rsa 0.9.6", + "serde", + "serde_json", + "sha2", + "strum 0.26.3", + "zeroize", +] + [[package]] name = "crypto" version = "0.1.0" @@ -2970,18 +3008,18 @@ dependencies = [ [[package]] name = "kbs_protocol" version = "0.1.0" -source = "git+https://github.com/confidential-containers/guest-components.git?rev=e6999a3c0fd877dae9e68ea78b8b483062db32b8#e6999a3c0fd877dae9e68ea78b8b483062db32b8" +source = "git+https://github.com/Xynnn007/guest-components.git?rev=2bfe3559bf273ddc835817498843f49c85359bbf#2bfe3559bf273ddc835817498843f49c85359bbf" dependencies = [ "anyhow", "async-trait", - "attester", + "attester 0.1.0 (git+https://github.com/Xynnn007/guest-components.git?rev=2bfe3559bf273ddc835817498843f49c85359bbf)", "base64 0.22.1", - "crypto", + "crypto 0.1.0 (git+https://github.com/Xynnn007/guest-components.git?rev=2bfe3559bf273ddc835817498843f49c85359bbf)", "jwt-simple 0.12.9", "kbs-types", "log", "reqwest 0.12.9", - "resource_uri", + "resource_uri 0.1.0 (git+https://github.com/Xynnn007/guest-components.git?rev=2bfe3559bf273ddc835817498843f49c85359bbf)", "serde", "serde_json", "sha2", @@ -3009,7 +3047,7 @@ dependencies = [ "prost 0.13.3", "rand", "reqwest 0.12.9", - "resource_uri", + "resource_uri 0.1.0 (git+https://github.com/confidential-containers/guest-components.git?rev=e6999a3c0fd877dae9e68ea78b8b483062db32b8)", "ring", "serde", "serde_json", @@ -4458,6 +4496,17 @@ dependencies = [ "windows-registry", ] +[[package]] +name = "resource_uri" +version = "0.1.0" +source = "git+https://github.com/Xynnn007/guest-components.git?rev=2bfe3559bf273ddc835817498843f49c85359bbf#2bfe3559bf273ddc835817498843f49c85359bbf" +dependencies = [ + "anyhow", + "serde", + "serde_json", + "url", +] + [[package]] name = "resource_uri" version = "0.1.0" @@ -5044,30 +5093,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "sev" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2890179f8ef689340f441ba05f0b268bc14f672ae4b36d629cc2266d0d747ab" -dependencies = [ - "base64 0.21.7", - "bincode", - "bitfield 0.13.2", - "bitflags 1.3.2", - "byteorder", - "codicon", - "dirs", - "hex", - "iocuddle", - "lazy_static", - "libc", - "serde", - "serde-big-array", - "serde_bytes", - "static_assertions", - "uuid", -] - [[package]] name = "sev" version = "4.0.0" @@ -6194,7 +6219,7 @@ dependencies = [ "serde_json", "serde_with", "serial_test", - "sev 4.0.0", + "sev", "sha2", "shadow-rs", "strum 0.25.0", diff --git a/Cargo.toml b/Cargo.toml index 1d69c5b0d..ac5a78378 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,14 +29,20 @@ config = "0.13.3" env_logger = "0.10.0" hex = "0.4.3" jwt-simple = "0.11" -kbs_protocol = { git = "https://github.com/confidential-containers/guest-components.git", rev="e6999a3c0fd877dae9e68ea78b8b483062db32b8", default-features = false } +kbs_protocol = { git = "https://github.com/Xynnn007/guest-components.git", rev = "2bfe3559bf273ddc835817498843f49c85359bbf", default-features = false } kbs-types = "0.7.0" -kms = { git = "https://github.com/confidential-containers/guest-components.git", rev="e6999a3c0fd877dae9e68ea78b8b483062db32b8", default-features = false } +kms = { git = "https://github.com/confidential-containers/guest-components.git", rev = "e6999a3c0fd877dae9e68ea78b8b483062db32b8", default-features = false } jsonwebtoken = { version = "9", default-features = false } log = "0.4.17" prost = "0.12" -regorus = { version = "0.1.5", default-features = false, features = ["regex", "base64", "time"] } -reqwest = { version = "0.12", default-features = false, features = ["default-tls"] } +regorus = { version = "0.1.5", default-features = false, features = [ + "regex", + "base64", + "time", +] } +reqwest = { version = "0.12", default-features = false, features = [ + "default-tls", +] } rstest = "0.18.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.132" @@ -46,7 +52,7 @@ sha2 = "0.10" shadow-rs = "0.19.0" strum = { version = "0.25", features = ["derive"] } thiserror = "1.0" -tokio = { version = "1", features = ["full"], default-features = false } +tokio = { version = "1", features = ["full"], default-features = false } tempfile = "3.14.0" tonic = "0.11" tonic-build = "0.11"