Merge pull request #7852 from surajssd/update-aa-imagers-tdshim2

CCv0: Update image-rs, AA and td-shim
This commit is contained in:
Steve Horsman
2023-10-31 09:00:15 +00:00
committed by GitHub
3 changed files with 5 additions and 5 deletions

4
src/agent/Cargo.lock generated
View File

@@ -2015,7 +2015,7 @@ dependencies = [
[[package]] [[package]]
name = "image-rs" name = "image-rs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/confidential-containers/guest-components?rev=917d5cff1cf57e2555426b6dd8bf59dc3b7f0901#917d5cff1cf57e2555426b6dd8bf59dc3b7f0901" source = "git+https://github.com/confidential-containers/guest-components?rev=615a46ff16ee8670014946d14e44e85cede82f01#615a46ff16ee8670014946d14e44e85cede82f01"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-compression", "async-compression",
@@ -2921,7 +2921,7 @@ dependencies = [
[[package]] [[package]]
name = "ocicrypt-rs" name = "ocicrypt-rs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/confidential-containers/guest-components?rev=917d5cff1cf57e2555426b6dd8bf59dc3b7f0901#917d5cff1cf57e2555426b6dd8bf59dc3b7f0901" source = "git+https://github.com/confidential-containers/guest-components?rev=615a46ff16ee8670014946d14e44e85cede82f01#615a46ff16ee8670014946d14e44e85cede82f01"
dependencies = [ dependencies = [
"aes 0.8.3", "aes 0.8.3",
"anyhow", "anyhow",

View File

@@ -74,7 +74,7 @@ clap = { version = "3.0.1", features = ["derive"] }
openssl = { version = "0.10.38", features = ["vendored"] } openssl = { version = "0.10.38", features = ["vendored"] }
# Image pull/decrypt # Image pull/decrypt
image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "917d5cff1cf57e2555426b6dd8bf59dc3b7f0901", default-features = false, features = [ image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "615a46ff16ee8670014946d14e44e85cede82f01", default-features = false, features = [
"kata-cc-native-tls", "kata-cc-native-tls",
"verity", "verity",
"signature-simple-xrss", "signature-simple-xrss",

View File

@@ -200,7 +200,7 @@ externals:
attestation-agent: attestation-agent:
description: "Provide attested key unwrapping for image decryption" description: "Provide attested key unwrapping for image decryption"
url: "https://github.com/confidential-containers/guest-components/" url: "https://github.com/confidential-containers/guest-components/"
version: "917d5cff1cf57e2555426b6dd8bf59dc3b7f0901" version: "615a46ff16ee8670014946d14e44e85cede82f01"
cni-plugins: cni-plugins:
description: "CNI network plugins" description: "CNI network plugins"
@@ -332,7 +332,7 @@ externals:
# yamllint disable-line rule:line-length # yamllint disable-line rule:line-length
description: "Confidential Containers Shim Firmware -- DO NOT TOUCH on main -> CCv0 merges" description: "Confidential Containers Shim Firmware -- DO NOT TOUCH on main -> CCv0 merges"
url: "https://github.com/confidential-containers/td-shim" url: "https://github.com/confidential-containers/td-shim"
version: "4da7dfcdd9faabd1bf9a7dc144c0206939b6d383" version: "3f18d9f3f51c9428c034cf01b45ab94bcd0d1622"
toolchain: "nightly-2023-08-28" toolchain: "nightly-2023-08-28"
virtiofsd: virtiofsd: