diff --git a/backport-init-attestation.patch b/backport-init-attestation.patch index 115443c..15061cb 100644 --- a/backport-init-attestation.patch +++ b/backport-init-attestation.patch @@ -10,6 +10,7 @@ Reference: https://gitee.com/openeuler/secGear/commit/d06b6beab9ae13898870297e8e https://gitee.com/openeuler/secGear/commit/dad056809c5e94b50c47063d728d5f1e47800512 https://gitee.com/openeuler/secGear/commit/ce4c7b6a8c013cd208004a3cec13a15fff100b1a https://gitee.com/openeuler/secGear/commit/8e02b257d9bec81bc557d6431e90448522ad6270 + https://gitee.com/openeuler/secGear/commit/980d0a89d3b1b1a6d280846d6edddabdfd57a635 Conflict:no --- .../attestation/attestation-agent/Cargo.toml | 30 ++ @@ -108,7 +109,7 @@ new file mode 100644 index 0000000..66919d9 --- /dev/null +++ b/service/attestation/attestation-agent/agent/Cargo.toml -@@ -0,0 +1,38 @@ +@@ -0,0 +1,39 @@ +[package] +name = "attestation-agent" +version = "0.1.0" @@ -127,6 +128,7 @@ index 0000000..66919d9 + +[features] +no_as = [ "verifier" ] ++with_as = [] +all = ["itrustee", "virtcca"] +itrustee = ["attester/itrustee-attester", "verifier/itrustee-verifier"] +virtcca = ["attester/virtcca-attester", "verifier/virtcca-verifier"] @@ -159,7 +161,7 @@ new file mode 100644 index 0000000..9aec2bb --- /dev/null +++ b/service/attestation/attestation-agent/agent/src/agent.rs -@@ -0,0 +1,144 @@ +@@ -0,0 +1,145 @@ +/* + * Copyright (c) Huawei Technologies Co., Ltd. 2024. All rights reserved. + * secGear is licensed under the Mulan PSL v2. @@ -210,9 +212,10 @@ index 0000000..9aec2bb + async fn verify_evidence(&self, challenge: &[u8], evidence: &[u8]) -> Result<()> { + #[cfg(feature = "no_as")] + let _ret = Verifier::default().verify_evidence(challenge, evidence).await?; -+ ++ #[cfg(feature = "with_as")] + let _ret = request_as(challenge, evidence); -+ return _ret; ++ ++ return Ok(_ret); + } +} + @@ -405,7 +408,7 @@ index 0000000..0f1efc2 +use attester::EvidenceRequest; + +#[ffi_export] -+pub fn get_reprot(c_uuid: Option<&repr_c::String>, c_challenge: Option<&repr_c::Vec>) -> repr_c::Vec { ++pub fn get_report(c_uuid: Option<&repr_c::String>, c_challenge: Option<&repr_c::Vec>) -> repr_c::Vec { + let uuid = match c_uuid { + None => {println!("uuid is null"); return Vec::new().into();}, + Some(uuid) => uuid.clone().to_string(), @@ -1044,7 +1047,7 @@ index 0000000..e06e61e + +/** */ +Vec_uint8_t -+get_reprot ( ++get_report ( + Vec_uint8_t const * c_uuid, + Vec_uint8_t const * c_challenge); + diff --git a/secGear.spec b/secGear.spec index 3375b6b..3a7cf3f 100644 --- a/secGear.spec +++ b/secGear.spec @@ -1,6 +1,6 @@ Name: secGear Version: 0.1.0 -Release: 37 +Release: 38 Summary: secGear is an SDK to develop confidential computing apps based on hardware enclave features @@ -251,6 +251,9 @@ popd systemctl restart rsyslog %changelog +* Tue Jun 4 2024 zhengxiaoxiao - 0.1.0-38 +- add with_as and fix typo + * Mon Jun 3 2024 zhengxiaoxiao - 0.1.0-37 - fix spec error and the null pointer judgment