From 886703907ca511d314b4258d336b58dfe23eb362 Mon Sep 17 00:00:00 2001
From: Qi Feng Huo <huoqif@cn.ibm.com>
Date: Tue, 11 Jun 2024 09:50:26 +0800
Subject: [PATCH] Verifier: Add IBM Secure Execution and update
 guest-components rev

Signed-off-by: Qi Feng Huo <huoqif@cn.ibm.com>
---
 Cargo.lock                  | 32 ++++++++++++--------------------
 kbs/tools/client/Cargo.toml |  2 +-
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9f3ac7644..163babbb7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -413,7 +413,7 @@ dependencies = [
  "env_logger 0.10.2",
  "jsonwebtoken",
  "jwt-simple",
- "kbs-types 0.6.0",
+ "kbs-types",
  "lazy_static",
  "log",
  "mobc",
@@ -537,7 +537,7 @@ dependencies = [
  "env_logger 0.10.2",
  "futures",
  "hex",
- "kbs-types 0.6.0",
+ "kbs-types",
  "lazy_static",
  "log",
  "openssl",
@@ -567,7 +567,7 @@ dependencies = [
 [[package]]
 name = "attester"
 version = "0.1.0"
-source = "git+https://github.com/confidential-containers/guest-components.git?rev=5ae8d8ed136aef6303dc9802df04d19b86e1e70d#5ae8d8ed136aef6303dc9802df04d19b86e1e70d"
+source = "git+https://github.com/confidential-containers/guest-components.git?rev=c543f208211aedd5fbecc5ddddf4c3200d0bbc00#c543f208211aedd5fbecc5ddddf4c3200d0bbc00"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -578,13 +578,15 @@ dependencies = [
  "csv-rs",
  "hyper",
  "hyper-tls",
- "kbs-types 0.5.3",
+ "kbs-types",
  "log",
  "nix",
  "occlum_dcap",
+ "s390_pv",
  "scroll 0.12.0",
  "serde",
  "serde_json",
+ "serde_with",
  "sev",
  "sha2",
  "strum",
@@ -1293,13 +1295,13 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 [[package]]
 name = "crypto"
 version = "0.1.0"
-source = "git+https://github.com/confidential-containers/guest-components.git?rev=5ae8d8ed136aef6303dc9802df04d19b86e1e70d#5ae8d8ed136aef6303dc9802df04d19b86e1e70d"
+source = "git+https://github.com/confidential-containers/guest-components.git?rev=c543f208211aedd5fbecc5ddddf4c3200d0bbc00#c543f208211aedd5fbecc5ddddf4c3200d0bbc00"
 dependencies = [
  "aes-gcm",
  "anyhow",
  "base64 0.21.7",
  "ctr",
- "kbs-types 0.5.3",
+ "kbs-types",
  "rand",
  "rsa 0.9.6",
  "serde",
@@ -2512,16 +2514,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "kbs-types"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1f4b0642769e12f56cfc646d8be13668ed48d3caed0e99efb161c407f3ec532"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "kbs-types"
 version = "0.6.0"
@@ -2535,7 +2527,7 @@ dependencies = [
 [[package]]
 name = "kbs_protocol"
 version = "0.1.0"
-source = "git+https://github.com/confidential-containers/guest-components.git?rev=5ae8d8ed136aef6303dc9802df04d19b86e1e70d#5ae8d8ed136aef6303dc9802df04d19b86e1e70d"
+source = "git+https://github.com/confidential-containers/guest-components.git?rev=c543f208211aedd5fbecc5ddddf4c3200d0bbc00#c543f208211aedd5fbecc5ddddf4c3200d0bbc00"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2543,7 +2535,7 @@ dependencies = [
  "base64 0.21.7",
  "crypto",
  "jwt-simple",
- "kbs-types 0.5.3",
+ "kbs-types",
  "log",
  "reqwest",
  "resource_uri",
@@ -3836,7 +3828,7 @@ dependencies = [
 [[package]]
 name = "resource_uri"
 version = "0.1.0"
-source = "git+https://github.com/confidential-containers/guest-components.git?rev=5ae8d8ed136aef6303dc9802df04d19b86e1e70d#5ae8d8ed136aef6303dc9802df04d19b86e1e70d"
+source = "git+https://github.com/confidential-containers/guest-components.git?rev=c543f208211aedd5fbecc5ddddf4c3200d0bbc00#c543f208211aedd5fbecc5ddddf4c3200d0bbc00"
 dependencies = [
  "anyhow",
  "serde",
@@ -5438,7 +5430,7 @@ dependencies = [
  "intel-tee-quote-verification-rs",
  "jsonwebkey",
  "jsonwebtoken",
- "kbs-types 0.6.0",
+ "kbs-types",
  "log",
  "openssl",
  "rstest",
diff --git a/kbs/tools/client/Cargo.toml b/kbs/tools/client/Cargo.toml
index 3fa24c25d..b3101bfba 100644
--- a/kbs/tools/client/Cargo.toml
+++ b/kbs/tools/client/Cargo.toml
@@ -18,7 +18,7 @@ base64.workspace = true
 clap = { version = "4.0.29", features = ["derive"] }
 env_logger.workspace = true
 jwt-simple = "0.11.4"
-kbs_protocol = { git = "https://github.com/confidential-containers/guest-components.git", rev="5ae8d8ed136aef6303dc9802df04d19b86e1e70d", default-features = false }
+kbs_protocol = { git = "https://github.com/confidential-containers/guest-components.git", rev="c543f208211aedd5fbecc5ddddf4c3200d0bbc00", default-features = false }
 log.workspace = true
 reqwest = { version = "0.11.18", default-features = false, features = ["cookies", "json"] }
 serde = { version = "1.0", features = ["derive"] }