!181 modify verifier features and cargo build command

From: @zhengxiaoxiaoGitee 
Reviewed-by: @houmingyong 
Signed-off-by: @houmingyong
This commit is contained in:
openeuler-ci-bot 2024-06-05 11:03:57 +00:00 committed by Gitee
commit 7148928265
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 17 additions and 10 deletions

View File

@ -11,6 +11,7 @@ Reference: https://gitee.com/openeuler/secGear/commit/d06b6beab9ae13898870297e8e
https://gitee.com/openeuler/secGear/commit/ce4c7b6a8c013cd208004a3cec13a15fff100b1a
https://gitee.com/openeuler/secGear/commit/8e02b257d9bec81bc557d6431e90448522ad6270
https://gitee.com/openeuler/secGear/commit/980d0a89d3b1b1a6d280846d6edddabdfd57a635
https://gitee.com/openeuler/secGear/commit/1fbc825bd34e859f3bc641f6b1b14c106be23433
Conflict:no
---
.../attestation/attestation-agent/Cargo.toml | 30 ++
@ -109,7 +110,7 @@ new file mode 100644
index 0000000..66919d9
--- /dev/null
+++ b/service/attestation/attestation-agent/agent/Cargo.toml
@@ -0,0 +1,39 @@
@@ -0,0 +1,42 @@
+[package]
+name = "attestation-agent"
+version = "0.1.0"
@ -127,11 +128,14 @@ index 0000000..66919d9
+crate-type = ["lib", "cdylib"]
+
+[features]
+no_as = [ "verifier" ]
+no_as = []
+with_as = []
+all = ["itrustee", "virtcca"]
+itrustee = ["attester/itrustee-attester", "verifier/itrustee-verifier"]
+virtcca = ["attester/virtcca-attester", "verifier/virtcca-verifier"]
+itrustee-attester = ["attester/itrustee-attester"]
+virtcca-attester = ["attester/virtcca-attester"]
+all-attester = ["attester/itrustee-attester", "attester/virtcca-attester"]
+itrustee-verifier = ["verifier/itrustee-verifier"]
+virtcca-verifier = ["verifier/virtcca-verifier"]
+all-verifier = ["verifier/itrustee-verifier", "verifier/virtcca-verifier"]
+headers = ["safer-ffi/headers"]
+
+[dependencies]
@ -552,7 +556,7 @@ index 0000000..9a711c2
+ );
+}
+
+#[link(name = "qca")]
+//#[link(name = "qca")]
+extern "C" {
+ pub fn RemoteAttest(
+ in_: *mut ra_buffer_data,

View File

@ -1,6 +1,6 @@
Name: secGear
Version: 0.1.0
Release: 38
Release: 39
Summary: secGear is an SDK to develop confidential computing apps based on hardware enclave features
@ -89,14 +89,14 @@ BUildRequires: glibc glibc-devel cmake ocaml-dune rpm gcc-c++ openssl-libs opens
BUildRequires: sgxsdk libsgx-launch libsgx-urts intel-sgx-ssl-devel
%else
BUildRequires: itrustee_sdk itrustee_sdk-devel
BuildRequires: rust cargo rust-packaging virtCCA_sdk-devel virtCCA_sdk
BuildRequires: rust cargo rust-packaging virtCCA_sdk-devel virtCCA_sdk kunpengsecl-attester
%endif
Requires: rsyslog openssl-libs
%ifarch x86_64
Requires: linux-sgx-driver sgxsdk libsgx-launch libsgx-urts libsgx-aesm-launch-plugin intel-sgx-ssl
%else
Requires: itrustee_sdk
Requires: itrustee_sdk kunpengsecl-attester
%endif
%description
@ -162,7 +162,7 @@ replace-with = "vendored-sources"
[source.vendored-sources]
directory = "vendor"
EOF
%{_cargo} build --features virtcca,no_as --lib --release
%{_cargo} build --features no_as,all-attester,itrustee-verifier --lib --release
%endif
%install
@ -251,6 +251,9 @@ popd
systemctl restart rsyslog
%changelog
* Wed Jun 5 2024 zhengxiaoxiao <zhengxiaoxiao2@huawei.com> - 0.1.0-39
- modify verifier features and cargo build command
* Tue Jun 4 2024 zhengxiaoxiao <zhengxiaoxiao2@huawei.com> - 0.1.0-38
- add with_as and fix typo