diff --git a/0058-adapt-itrustee_sdk-openssl-path-modification.patch b/0058-adapt-itrustee_sdk-openssl-path-modification.patch new file mode 100644 index 0000000000000000000000000000000000000000..e238d5e38ee14b5970468cf21c49b61d65956895 --- /dev/null +++ b/0058-adapt-itrustee_sdk-openssl-path-modification.patch @@ -0,0 +1,39 @@ +From df029321c49e468f19fb62ff6f629ed4ba628a6e Mon Sep 17 00:00:00 2001 +From: houmingyong +Date: Wed, 26 Apr 2023 15:55:07 +0800 +Subject: [PATCH] adapt itrustee_sdk openssl path modification + +--- + component/secure_channel/enclave/CMakeLists.txt | 2 +- + examples/secure_channel/enclave/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/component/secure_channel/enclave/CMakeLists.txt b/component/secure_channel/enclave/CMakeLists.txt +index 0305589..548e942 100644 +--- a/component/secure_channel/enclave/CMakeLists.txt ++++ b/component/secure_channel/enclave/CMakeLists.txt +@@ -67,7 +67,7 @@ if(CC_GP) + ${LOCAL_ROOT_PATH}/inc/enclave_inc/gp/itrustee + ${ITRUSTEE_TEEDIR}/include/TA + ${ITRUSTEE_TEEDIR}/include/TA/huawei_ext +- ${ITRUSTEE_TEEDIR}/include/TA/openssl ++ ${SDK_PATH}/thirdparty/open_source/openssl + ${ITRUSTEE_LIBC}/arch/aarch64 + ${ITRUSTEE_LIBC}/ + ${ITRUSTEE_LIBC}/arch/arm/bits +diff --git a/examples/secure_channel/enclave/CMakeLists.txt b/examples/secure_channel/enclave/CMakeLists.txt +index b40f665..e63a7dd 100644 +--- a/examples/secure_channel/enclave/CMakeLists.txt ++++ b/examples/secure_channel/enclave/CMakeLists.txt +@@ -64,7 +64,7 @@ if(CC_GP) + ${SECGEAR_INSTALL_DIR} + ${ITRUSTEE_TEEDIR}/include/TA + ${ITRUSTEE_TEEDIR}/include/TA/huawei_ext +- ${ITRUSTEE_TEEDIR}/include/TA/openssl ++ ${SDK_PATH}/thirdparty/open_source/openssl + ${ITRUSTEE_LIBC}/arch/aarch64 + ${ITRUSTEE_LIBC}/ + ${ITRUSTEE_LIBC}/arch/arm/bits +-- +2.33.0 + diff --git a/secGear.spec b/secGear.spec index b6d3c9042f34a51408bcf2673cb819907f2beefe..554b0b6b470e7218a53150284702c08508a8883e 100644 --- a/secGear.spec +++ b/secGear.spec @@ -1,6 +1,6 @@ Name: secGear Version: 0.1.0 -Release: 33 +Release: 34 Summary: secGear is an SDK to develop confidential computing apps based on hardware enclave features @@ -66,6 +66,7 @@ Patch53: 0054-fix-gen-ecall-header-error.patch Patch54: 0055-switchless-readme-add-async-interface.patch Patch55: 0056-destroy-enclave-release-remain-shared-memory.patch Patch56: 0057-new-feature-secure-channel-support.patch +Patch58: 0058-adapt-itrustee_sdk-openssl-path-modification.patch BuildRequires: gcc python automake autoconf libtool BUildRequires: glibc glibc-devel cmake ocaml-dune rpm gcc-c++ openssl-libs openssl-devel @@ -192,6 +193,9 @@ popd systemctl restart rsyslog %changelog +* Wed Apr 26 2023 houmingyong - 0.1.0-34 +- DESC:adapt itrustee_sdk openssl path modification + * Tue Apr 11 2023 houmingyong - 0.1.0-33 - DESC:new feature secure channel support