Skip to content

Commit 6882afa

Browse files
lzha101lzha101
committed
Intel(R) SGX DCAP 1.18 Release
Introduced Intel(R) TDX 1.4 and 1.5 support Upgraded Ring3 Abstraction Layer (R3AAL) library to support Intel(R) TDX MVP 6.2 kernel Enhanced quote verification performance in multi-thread scenarios Upgraded Intel(R) SGX Quote Verification Enclave to integrate latest OpenSSL/SgxSSL 1.1.1u Fixed bugs. Signed-off-by: Zhang, Lili Z <lili.z.zhang@intel.com>
1 parent e7604e0 commit 6882afa

File tree

117 files changed

+7455
-5827
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+7455
-5827
lines changed

‎QuoteGeneration/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ qpl_wrapper: qcnl_wrapper
7474
qve_wrapper:
7575
$(MAKE) -C ../QuoteVerification
7676

77+
td_migration:
78+
$(MAKE) -C quote_wrapper/td_migration/linux _TD_MIGRATION=1
7779

7880
.PHONY: deb_sgx_dcap_ql_pkg
7981
deb_sgx_dcap_ql_pkg: $(CHECK_OPT) pce_logic qe3_logic
@@ -237,6 +239,8 @@ clean:
237239
$(MAKE) -C quote_wrapper/qgs clean
238240
$(MAKE) -C quote_wrapper/tdx_quote/linux clean
239241
$(MAKE) -C quote_wrapper/tdx_attest/linux clean
242+
$(MAKE) -C quote_wrapper/tdx_verify/linux clean
243+
$(MAKE) -C quote_wrapper/td_migration/linux clean
240244
$(MAKE) -C qcnl/linux clean
241245
$(MAKE) -C qpl/linux clean
242246
$(MAKE) -C ../QuoteVerification clean

‎QuoteGeneration/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For Windows* OS
3939
**NOTE**:`sgx_dcap_dev.inf` is for Windows* Server 2016 LTSC and `sgx_dcap.inf` is for Windows* Server 2019 LTSC.
4040

4141
## How to install
42-
Refer to the *"Installation Instructions"* section in the [Intel(R) Software Guard Extensions: Data Center Attestation Primitives Installation Guide For Windows* OS](https://download.01.org/intel-sgx/sgx-dcap/1.17/windows/docs/Intel_SGX_DCAP_Windows_SW_Installation_Guide.pdf) to install the right packages on your platform.
42+
Refer to the *"Installation Instructions"* section in the [Intel(R) Software Guard Extensions: Data Center Attestation Primitives Installation Guide For Windows* OS](https://download.01.org/intel-sgx/sgx-dcap/1.18/windows/docs/Intel_SGX_DCAP_Windows_SW_Installation_Guide.pdf) to install the right packages on your platform.
4343

4444

4545
For Linux* OS

‎QuoteGeneration/buildenv.mk

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ SGX_MODE ?= HW
6666
SGX_ARCH ?= x64
6767
SGX_DEBUG ?= 0
6868

69-
ifneq ($(MAKECMDGOALS),clean)
70-
include $(SGX_SDK)/buildenv.mk
69+
ifndef _TD_MIGRATION
70+
ifneq ($(MAKECMDGOALS),clean)
71+
include $(SGX_SDK)/buildenv.mk
72+
endif
7173
endif
7274

7375
ifeq ($(shell getconf LONG_BIT), 32)
@@ -188,6 +190,10 @@ ifneq ($(MITIGATION-CVE-2020-0551), LOAD)
188190
endif
189191
endif
190192

193+
ifdef _TD_MIGRATION
194+
COMMON_FLAGS += -D_TD_MIGRATION
195+
endif
196+
191197
CFLAGS += $(COMMON_FLAGS)
192198
CXXFLAGS += $(COMMON_FLAGS)
193199

@@ -210,3 +216,12 @@ ENCLAVE_CXXFLAGS = $(ENCLAVE_CFLAGS) -nostdinc++
210216
ENCLAVE_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \
211217
-Wl,-pie,-eenclave_entry -Wl,--export-dynamic \
212218
-Wl,--defsym,__ImageBase=0
219+
220+
TD_MIGRATION_LINUX_TRUNK_ROOT_PATH := $(ROOT_DIR)/../../..
221+
TD_MIGRATION_STD_INC_PATH := $(TD_MIGRATION_LINUX_TRUNK_ROOT_PATH)/common/inc
222+
TD_MIGRATION_STD_LIB_PATH := $(TD_MIGRATION_LINUX_TRUNK_ROOT_PATH)/build/linux
223+
TD_MIGRATION_CFLAGS := $(CFLAGS) -ffreestanding -nostdinc -fPIC -fvisibility=hidden -D_TD_MIGRATION
224+
TD_MIGRATION_CXXFLAGS := $(TD_MIGRATION_CFLAGS) -nostdinc++
225+
TD_MIGRATION_LDFLAGS := -nostdlib -nodefaultlibs -nostartfiles \
226+
-Wl,-Bstatic -Wl,-Bsymbolic -Wl,--export-dynamic -Wl,--gc-sections -g
227+
TD_MIGRATION_BUILD_DIR := $(BUILD_DIR)/td_migration

‎QuoteGeneration/common/inc/internal/se_version.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@
2828
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*
3030
*/
31-
#define STRFILEVER "1.17.100.4"
31+
#define STRFILEVER "1.18.100.1"
3232
#define COPYRIGHT "Copyright (C) 2023 Intel Corporation"
33-
#define FILEVER 1,17,100,4
34-
#define PRODUCTVER 1,17,100,4
35-
#define STRPRODUCTVER "1.17.100.4"
33+
#define FILEVER 1,18,100,1
34+
#define PRODUCTVER 1,18,100,1
35+
#define STRPRODUCTVER "1.18.100.1"
3636
#define COMPANYNAME "Intel Corporation"
3737
#define PRODUCTNAME "Intel® Software Guard Extensions"
3838

39-
#define DEFAULT_QPL_VERSION "1.13.104.4"
40-
#define QUOTE_VERIFIER_VERSION "1.12.104.4"
41-
#define QUOTE_LOADER_VERSION "1.11.104.4"
42-
#define TDQE_WRAPPER_VERSION "1.14.104.4"
43-
#define PCE_WRAPPER_VERSION "1.14.104.4"
39+
#define DEFAULT_QPL_VERSION "1.13.105.1"
40+
#define QUOTE_VERIFIER_VERSION "1.12.105.1"
41+
#define QUOTE_LOADER_VERSION "1.11.105.1"
42+
#define TDQE_WRAPPER_VERSION "1.14.105.1"
43+
#define PCE_WRAPPER_VERSION "1.14.105.1"
4444

4545
#define QE3_VERSION "1.16.100.1"
46-
#define QVE_VERSION "1.17.100.1"
46+
#define QVE_VERSION "1.18.100.1"
4747
#define IDE_VERSION "1.16.100.1"
4848
#define TDQE_VERSION "1.16.100.1"

‎QuoteGeneration/download_prebuilt.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929

3030
@echo off
3131

32-
set ae_file_name=prebuilt_windows_dcap_1.17.zip
33-
set checksum_file=SHA256SUM_prebuilt_windows_dcap_1.17.cfg
34-
set server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.17/windows/
32+
set ae_file_name=prebuilt_windows_dcap_1.18.zip
33+
set checksum_file=SHA256SUM_prebuilt_windows_dcap_1.18.cfg
34+
set server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.18/windows/
3535
set server_ae_url=%server_url_path%/%ae_file_name%
3636
set server_checksum_url=%server_url_path%/%checksum_file%
3737

‎QuoteGeneration/download_prebuilt.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232

3333
top_dir=`dirname $0`
3434
out_dir=$top_dir
35-
ae_file_name=prebuilt_dcap_1.17.tar.gz
36-
checksum_file=SHA256SUM_prebuilt_dcap_1.17.cfg
37-
server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.17/linux/
35+
ae_file_name=prebuilt_dcap_1.18.tar.gz
36+
checksum_file=SHA256SUM_prebuilt_dcap_1.18.cfg
37+
server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.18/linux/
3838
server_ae_url=$server_url_path/$ae_file_name
3939
server_checksum_url=$server_url_path/$checksum_file
4040

‎QuoteGeneration/installer/linux/deb/libsgx-dcap-ql/libsgx-dcap-ql-1.0/debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ Homepage: https://github.com/intel/SGXDataCenterAttestationPrimitives
99
Package: libsgx-dcap-ql
1010
Architecture: amd64
1111
Depends: libsgx-qe3-logic(>= @dep_version@), libsgx-pce-logic(>= @dep_version@), ${shlibs:Depends}, ${misc:Depends}
12-
Recommends: libsgx-dcap-quote-verify(>= @dep_version@), libsgx-quote-ex(>= 2.20)
12+
Recommends: libsgx-dcap-quote-verify(>= @dep_version@), libsgx-quote-ex(>= 2.21)
1313
Description: Intel(R) Software Guard Extensions Data Center Attestation Primitives
1414

1515
Package: libsgx-dcap-ql-dev
1616
Section: devel
1717
Architecture: amd64
18-
Depends: libsgx-dcap-ql (= @dep_version@), libsgx-headers (>= 2.20)
18+
Depends: libsgx-dcap-ql (= @dep_version@), libsgx-headers (>= 2.21)
1919
Description: Intel(R) Software Guard Extensions Data Center Attestation Primitives For Developers

‎QuoteGeneration/installer/linux/deb/libsgx-dcap-quote-verify/libsgx-dcap-quote-verify-1.0/debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ Homepage: https://github.com/intel/SGXDataCenterAttestationPrimitives
99
Package: libsgx-dcap-quote-verify
1010
Architecture: amd64
1111
Depends: ${shlibs:Depends}, ${misc:Depends}
12-
Recommends: libsgx-ae-qve (>= @dep_version@), libsgx-urts (>= 2.20)
12+
Recommends: libsgx-ae-qve (>= @dep_version@), libsgx-urts (>= 2.21)
1313
Description: Intel(R) Software Guard Extensions Data Center Attestation Primitives
1414

1515
Package: libsgx-dcap-quote-verify-dev
1616
Section: devel
1717
Architecture: amd64
18-
Depends: libsgx-dcap-quote-verify (= @dep_version@), libsgx-headers (>= 2.20)
18+
Depends: libsgx-dcap-quote-verify (= @dep_version@), libsgx-headers (>= 2.21)
1919
Description: Intel(R) Software Guard Extensions Data Center Attestation Primitives For Developers

‎QuoteGeneration/installer/linux/deb/libsgx-pce-logic/libsgx-pce-logic-1.0/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ Homepage: https://github.com/intel/SGXDataCenterAttestationPrimitives
88

99
Package: libsgx-pce-logic
1010
Architecture: amd64
11-
Depends: libsgx-urts (>= 2.20), libsgx-ae-pce(>= 2.20), ${shlibs:Depends}, ${misc:Depends}
11+
Depends: libsgx-urts (>= 2.21), libsgx-ae-pce(>= 2.21), ${shlibs:Depends}, ${misc:Depends}
1212
Description: Intel(R) Software Guard Extensions Data Center Attestation Primitives

‎QuoteGeneration/installer/linux/deb/libsgx-qe3-logic/libsgx-qe3-logic-1.0/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ Homepage: https://github.com/intel/SGXDataCenterAttestationPrimitives
88

99
Package: libsgx-qe3-logic
1010
Architecture: amd64
11-
Depends: libsgx-urts (>= 2.20), libsgx-ae-qe3(>= @dep_version@), libsgx-ae-id-enclave(>= @dep_version@), ${shlibs:Depends}, ${misc:Depends}
11+
Depends: libsgx-urts (>= 2.21), libsgx-ae-qe3(>= @dep_version@), libsgx-ae-id-enclave(>= @dep_version@), ${shlibs:Depends}, ${misc:Depends}
1212
Description: Intel(R) Software Guard Extensions Data Center Attestation Primitives

0 commit comments

Comments
 (0)