From 1a99bcb98d50523b10338b2608b1b5695db9882b Mon Sep 17 00:00:00 2001 From: houmingyong Date: Tue, 6 Jun 2023 21:18:24 +0800 Subject: [PATCH] adapt sign tool to pass API_LEVEL --- 0069-adapt-sign-tool-to-pass-API_LEVEL.patch | 28 ++++++++++++++++++++ secGear.spec | 6 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0069-adapt-sign-tool-to-pass-API_LEVEL.patch diff --git a/0069-adapt-sign-tool-to-pass-API_LEVEL.patch b/0069-adapt-sign-tool-to-pass-API_LEVEL.patch new file mode 100644 index 0000000..04c237e --- /dev/null +++ b/0069-adapt-sign-tool-to-pass-API_LEVEL.patch @@ -0,0 +1,28 @@ +From 0962d86c5a359171191c127479491217074039b7 Mon Sep 17 00:00:00 2001 +From: houmingyong +Date: Tue, 6 Jun 2023 21:15:39 +0800 +Subject: [PATCH] adapt sign tool to pass API_LEVEL + +--- + tools/sign_tool/sign_tool.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tools/sign_tool/sign_tool.sh b/tools/sign_tool/sign_tool.sh +index c567423..74e2514 100755 +--- a/tools/sign_tool/sign_tool.sh ++++ b/tools/sign_tool/sign_tool.sh +@@ -122,8 +122,10 @@ itrustee_start_sign() { + cp ${IN_ENCLAVE} ${IN_PATH}/libcombine.so + OUT_PATH=$(dirname ${OUT_FILE}) + echo ${IN_PATH} ${OUT_PATH} ++ echo "CFLAGS += -DAPI_LEVEL=${API_LEVEL}" > ${IN_PATH}/config.mk + python3 -B ${signtoolpath}/signtool_v3.py ${IN_PATH} ${OUT_PATH} --privateCfg ${A_CONFIG_FILE} +- rm -rf ${IN_PATH}/libcombine.so ++ rm -f ${IN_PATH}/config.mk ++ rm -f ${IN_PATH}/libcombine.so + else + echo "Error: illegal command" + fi +-- +2.33.0 + diff --git a/secGear.spec b/secGear.spec index 970a90a..a2c482d 100644 --- a/secGear.spec +++ b/secGear.spec @@ -1,6 +1,6 @@ Name: secGear Version: 0.1.0 -Release: 42 +Release: 43 Summary: secGear is an SDK to develop confidential computing apps based on hardware enclave features @@ -77,6 +77,7 @@ Patch64: 0065-optimize-name-ree-agent-to-ra-agent.patch Patch65: 0066-fix-error-file-name.patch Patch66: 0067-local-attest-verify-input-hash-pointer.patch Patch67: 0068-bugfix-when-input-empty-hash.patch +Patch68: 0069-adapt-sign-tool-to-pass-API_LEVEL.patch BuildRequires: gcc python automake autoconf libtool BUildRequires: glibc glibc-devel cmake ocaml-dune rpm gcc-c++ openssl-libs openssl-devel @@ -208,6 +209,9 @@ popd systemctl restart rsyslog %changelog +* Tue Jun 6 2023 houmingyong - 0.1.0-43 +- DESC: adapt sign tool to pass API_LEVEL + * Sat Jun 3 2023 houmingyong - 0.1.0-42 - DESC: bugfix input empty hash -- Gitee