packages/linux-sgx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add strip compilation option for pck-id-retrieval-tool

Browse Source 
(cherry picked from commit f6e3fc6ff3f33d5e2c323e55f0ebdad2090d6541)
This commit is contained in:
w00559322 2022-09-20 16:02:58 +08:00 committed by openeuler-sync-bot
parent 9a2a02c604
commit 8481fed060
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
add-strip-compilation-option-for-pck-id-retrieval-tool.patch Normal file
View File

@ -0,0 +1,25 @@
From 4788eadaf33cc6b88ab883e43804e1f237779104 Mon Sep 17 00:00:00 2001
From: wangyu <wangyu283@huawei.com>
Date: Tue, 20 Sep 2022 15:06:21 +0800
Subject: [PATCH] add -s to link flags for PCKRetrievalTool
---
.../tools/PCKRetrievalTool/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.12.1/tools/PCKRetrievalTool/Makefile b/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.12.1/tools/PCKRetrievalTool/Makefile
index 116db7d..7c13b6e 100644
--- a/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.12.1/tools/PCKRetrievalTool/Makefile
+++ b/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.12.1/tools/PCKRetrievalTool/Makefile
@@ -142,7 +142,7 @@ Enclave_Link_Flags := $(SGX_COMMON_CFLAGS) -Wl,--no-undefined -nostdlib -nodefau
-Wl,-pie,-eenclave_entry -Wl,--export-dynamic \
-Wl,--defsym,__ImageBase=0 -Wl,--gc-sections \
-Wl,-z,relro,-z,now,-z,noexecstack \
- -Wl,--version-script=Enclave/Enclave.lds
+ -Wl,--version-script=Enclave/Enclave.lds -s
Enclave_Cpp_Objects := $(Enclave_Cpp_Files:.cpp=.o)
ENCLAVE_LIBRARY_PATH := Enclave/
--
1.8.3.1

6
linux-sgx.spec
View File

@ -1,6 +1,6 @@
Name: linux-sgx Name: linux-sgx
Version: 2.15.1 Version: 2.15.1
Release: 6 Release: 7
Summary: Intel(R) Software Guard Extensions for Linux* OS Summary: Intel(R) Software Guard Extensions for Linux* OS
ExclusiveArch: x86_64 ExclusiveArch: x86_64
License: BSD-3-Clause License: BSD-3-Clause
@ -29,6 +29,7 @@ Patch7: adapt-openssl-CVE.patch
Patch8: backport-CVE-2022-2068-Fix-file-operations-in-c_rehash.patch Patch8: backport-CVE-2022-2068-Fix-file-operations-in-c_rehash.patch
Patch9: backport-CVE-2022-2097-Fix-AES-OCB-encrypt-decrypt-for-x86-AES-NI.patch Patch9: backport-CVE-2022-2097-Fix-AES-OCB-encrypt-decrypt-for-x86-AES-NI.patch
Patch10: DCAP-disabling-the-rpatch-option.patch Patch10: DCAP-disabling-the-rpatch-option.patch
Patch11: add-strip-compilation-option-for-pck-id-retrieval-tool.patch
BuildRequires: gcc-c++ protobuf-devel libtool ocaml-ocamlbuild openssl openssl-devel cmake python curl-devel createrepo_c git nasm BuildRequires: gcc-c++ protobuf-devel libtool ocaml-ocamlbuild openssl openssl-devel cmake python curl-devel createrepo_c git nasm
@ -1029,6 +1030,9 @@ fi
%files -n libsgx-headers -f %{LINUX_INSTALLER_RPM_DIR}/libsgx-headers/build/list-libsgx-headers %files -n libsgx-headers -f %{LINUX_INSTALLER_RPM_DIR}/libsgx-headers/build/list-libsgx-headers
%changelog %changelog
* Tue Sep 20 2022 wangyu <wangyu283@huawei.com> - 2.15.1-7
- add strip compilation option for pck-id-retrieval-tool
* Fri Sep 09 2022 wangyu <wangyu283@huawei.com> - 2.15.1-6 * Fri Sep 09 2022 wangyu <wangyu283@huawei.com> - 2.15.1-6
- DCAP disabling the rpatch option - DCAP disabling the rpatch option