Skip to content

Commit f2bf3c4

Browse files
lllyllly
committed
Intel(R) SGX DCAP 1.20 Release
Introduced the Intel DCAP Appraisal Engine within quote verification library, empowering users to evaluate verification results against diverse policies. Upgraded Intel SGX Quote Verification Enclave to integrate OpenSSL/SgxSSL 3.0.12. Added Rust wrapper for quote provider library APIs. Fixed bugs. Signed-off-by: Li, Xun <[email protected]>
1 parent f0db05a commit f2bf3c4

File tree

662 files changed

+14360
-88794
lines changed

Some content is hidden

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

662 files changed

+14360
-88794
lines changed

‎.gitmodules‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[submodule "QuoteVerification/QVL"]
2+
path = QuoteVerification/QVL
3+
url = https://github.com/intel/SGX-TDX-DCAP-QuoteVerificationLibrary.git
4+
branch = DCAP/1.20
5+
[submodule "QuoteVerification/QuoteVerificationService"]
6+
path = QuoteVerification/QuoteVerificationService
7+
url = https://github.com/intel/SGX-TDX-DCAP-QuoteVerificationService.git
8+
branch = stable
9+
[submodule "external/wasm-micro-runtime"]
10+
path = external/wasm-micro-runtime
11+
url = https://github.com/bytecodealliance/wasm-micro-runtime.git
12+
branch = main
13+
[submodule "external/jwt-cpp"]
14+
path = external/jwt-cpp
15+
url = https://github.com/Thalhammer/jwt-cpp.git

‎QuoteGeneration/Makefile‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +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
77+
servtd_attest:
78+
$(MAKE) -C quote_wrapper/servtd_attest/linux SERVTD_ATTEST=1
7979

8080
.PHONY: deb_sgx_dcap_ql_pkg
8181
deb_sgx_dcap_ql_pkg: $(CHECK_OPT) pce_logic qe3_logic
@@ -154,9 +154,13 @@ deb_sgx_pck_id_retrieval_tool_pkg:
154154
deb_sgx_ra_service_pkg:
155155
$(MAKE) -C ../tools/SGXPlatformRegistration/ deb_pkg
156156

157+
.PHONY: deb_tee_appraisal_tool_pkg
158+
deb_tee_appraisal_tool_pkg:
159+
$(MAKE) -C ../QuoteVerification tee_appraisal_tool
160+
./installer/linux/deb/tee-appraisal-tool/build.sh
157161

158162
.PHONY: deb_pkg
159-
deb_pkg: deb_sgx_pce_logic_pkg deb_sgx_qe3_logic_pkg deb_sgx_dcap_ql_pkg deb_sgx_dcap_quote_verify_pkg deb_sgx_dcap_default_qpl_pkg deb_sgx_dcap_pccs_pkg deb_sgx_ae_qe3_pkg deb_sgx_ae_tdqe_pkg deb_sgx_ae_id_enclave_pkg deb_sgx_ae_qve_pkg deb_sgx_tdx_logic_pkg deb_sgx_tdx_qgs_pkg deb_sgx_tdx_attest_pkg deb_sgx_pck_id_retrieval_tool_pkg deb_sgx_ra_service_pkg
163+
deb_pkg: deb_sgx_pce_logic_pkg deb_sgx_qe3_logic_pkg deb_sgx_dcap_ql_pkg deb_sgx_dcap_quote_verify_pkg deb_sgx_dcap_default_qpl_pkg deb_sgx_dcap_pccs_pkg deb_sgx_ae_qe3_pkg deb_sgx_ae_tdqe_pkg deb_sgx_ae_id_enclave_pkg deb_sgx_ae_qve_pkg deb_sgx_tdx_logic_pkg deb_sgx_tdx_qgs_pkg deb_sgx_tdx_attest_pkg deb_sgx_pck_id_retrieval_tool_pkg deb_sgx_ra_service_pkg deb_tee_appraisal_tool_pkg
160164
@$(RM) -f ./installer/linux/deb/*.deb ./installer/linux/deb/*.ddeb
161165
cp `find ./installer/linux/deb/ -name "*.deb" -o -name "*.ddeb"` ./installer/linux/deb/
162166
cp `find ../tools/PCKRetrievalTool/installer/deb/ -name "*.deb" -o -name "*.ddeb"` ./installer/linux/deb/
@@ -226,8 +230,13 @@ rpm_sgx_pck_id_retrieval_tool_pkg:
226230
rpm_sgx_ra_service_pkg:
227231
$(MAKE) -C ../tools/SGXPlatformRegistration/ rpm_pkg
228232

233+
.PHONY: rpm_tee_appraisal_tool_pkg
234+
rpm_tee_appraisal_tool_pkg:
235+
$(MAKE) -C ../QuoteVerification tee_appraisal_tool
236+
./installer/linux/rpm/tee-appraisal-tool/build.sh
237+
229238
.PHONY: rpm_pkg
230-
rpm_pkg: rpm_sgx_dcap_ql_pkg rpm_sgx_dcap_default_qpl_pkg rpm_sgx_dcap_pccs_pkg rpm_sgx_ae_qe3_pkg rpm_sgx_ae_tdqe_pkg rpm_sgx_ae_id_enclave_pkg rpm_sgx_ae_qve_pkg rpm_sgx_tdx_logic_pkg rpm_sgx_tdx_qgs_pkg rpm_sgx_tdx_attest_pkg rpm_sgx_dcap_quote_verify_pkg rpm_sgx_pce_logic_pkg rpm_sgx_qe3_logic_pkg rpm_sgx_pck_id_retrieval_tool_pkg rpm_sgx_ra_service_pkg
239+
rpm_pkg: rpm_sgx_dcap_ql_pkg rpm_sgx_dcap_default_qpl_pkg rpm_sgx_dcap_pccs_pkg rpm_sgx_ae_qe3_pkg rpm_sgx_ae_tdqe_pkg rpm_sgx_ae_id_enclave_pkg rpm_sgx_ae_qve_pkg rpm_sgx_tdx_logic_pkg rpm_sgx_tdx_qgs_pkg rpm_sgx_tdx_attest_pkg rpm_sgx_dcap_quote_verify_pkg rpm_sgx_pce_logic_pkg rpm_sgx_qe3_logic_pkg rpm_sgx_pck_id_retrieval_tool_pkg rpm_sgx_ra_service_pkg rpm_tee_appraisal_tool_pkg
231240
@$(RM) -f ./installer/linux/rpm/*.rpm
232241
cp `find ./installer/linux/rpm/ -name "*.rpm"` ./installer/linux/rpm/
233242
cp `find ../tools/PCKRetrievalTool/installer/rpm/ -name "*.rpm"` ./installer/linux/rpm/
@@ -240,7 +249,7 @@ clean:
240249
$(MAKE) -C quote_wrapper/tdx_quote/linux clean
241250
$(MAKE) -C quote_wrapper/tdx_attest/linux clean
242251
$(MAKE) -C quote_wrapper/tdx_verify/linux clean
243-
$(MAKE) -C quote_wrapper/td_migration/linux clean
252+
$(MAKE) -C quote_wrapper/servtd_attest/linux clean
244253
$(MAKE) -C qcnl/linux clean
245254
$(MAKE) -C qpl/linux clean
246255
$(MAKE) -C ../QuoteVerification clean
@@ -264,6 +273,7 @@ clean:
264273
./installer/linux/deb/libsgx-dcap-default-qpl/clean.sh
265274
./installer/linux/deb/sgx-dcap-pccs/clean.sh
266275
../tools/PCKRetrievalTool/installer/deb/sgx-pck-id-retrieval-tool/clean.sh
276+
./installer/linux/deb/tee-appraisal-tool/clean.sh
267277
./installer/linux/rpm/libsgx-dcap-ql/clean.sh
268278
./installer/linux/rpm/libsgx-ae-qe3/clean.sh
269279
./installer/linux/rpm/libsgx-ae-tdqe/clean.sh
@@ -278,6 +288,7 @@ clean:
278288
./installer/linux/rpm/libsgx-dcap-default-qpl/clean.sh
279289
./installer/linux/rpm/sgx-dcap-pccs/clean.sh
280290
../tools/PCKRetrievalTool/installer/rpm/sgx-pck-id-retrieval-tool/clean.sh
291+
./installer/linux/rpm/tee-appraisal-tool/clean.sh
281292

282293
rebuild:
283294
$(MAKE) -f $(CUR_MKFILE) 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.19/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.20/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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ SGX_MODE ?= HW
6666
SGX_ARCH ?= x64
6767
SGX_DEBUG ?= 0
6868

69-
ifndef _TD_MIGRATION
69+
ifndef SERVTD_ATTEST
7070
ifneq ($(origin SGX_SDK),file)
71-
include $(SGX_SDK)/buildenv.mk
72-
else
71+
include $(SGX_SDK)/buildenv.mk
72+
else
7373
$(info You may need to set environment variables if the SGX SDK is installed.)
7474
$(info Use a command like 'source /opt/intel/sgxsdk/environment')
7575
endif
@@ -193,8 +193,8 @@ ifneq ($(MITIGATION-CVE-2020-0551), LOAD)
193193
endif
194194
endif
195195

196-
ifdef _TD_MIGRATION
197-
COMMON_FLAGS += -D_TD_MIGRATION
196+
ifdef SERVTD_ATTEST
197+
COMMON_FLAGS += -DSERVTD_ATTEST
198198
endif
199199

200200
CFLAGS += $(COMMON_FLAGS)
@@ -220,11 +220,11 @@ ENCLAVE_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefi
220220
-Wl,-pie,-eenclave_entry -Wl,--export-dynamic \
221221
-Wl,--defsym,__ImageBase=0
222222

223-
TD_MIGRATION_LINUX_TRUNK_ROOT_PATH := $(ROOT_DIR)/../../..
224-
TD_MIGRATION_STD_INC_PATH := $(TD_MIGRATION_LINUX_TRUNK_ROOT_PATH)/common/inc
225-
TD_MIGRATION_STD_LIB_PATH := $(TD_MIGRATION_LINUX_TRUNK_ROOT_PATH)/build/linux
226-
TD_MIGRATION_CFLAGS := $(CFLAGS) -ffreestanding -nostdinc -fPIC -fvisibility=hidden -D_TD_MIGRATION
227-
TD_MIGRATION_CXXFLAGS := $(TD_MIGRATION_CFLAGS) -nostdinc++
228-
TD_MIGRATION_LDFLAGS := -nostdlib -nodefaultlibs -nostartfiles \
223+
SERVTD_ATTEST_LINUX_TRUNK_ROOT_PATH := $(ROOT_DIR)/../../..
224+
SERVTD_ATTEST_STD_INC_PATH := $(SERVTD_ATTEST_LINUX_TRUNK_ROOT_PATH)/common/inc
225+
SERVTD_ATTEST_STD_LIB_PATH := $(SERVTD_ATTEST_LINUX_TRUNK_ROOT_PATH)/build/linux
226+
SERVTD_ATTEST_CFLAGS := $(CFLAGS) -ffreestanding -nostdinc -fPIC -fvisibility=hidden -DSERVTD_ATTEST
227+
SERVTD_ATTEST_CXXFLAGS := $(SERVTD_ATTEST_CFLAGS) -nostdinc++
228+
SERVTD_ATTEST_LDFLAGS := -nostdlib -nodefaultlibs -nostartfiles \
229229
-Wl,-Bstatic -Wl,-Bsymbolic -Wl,--export-dynamic -Wl,--gc-sections -g
230-
TD_MIGRATION_BUILD_DIR := $(BUILD_DIR)/td_migration
230+
SERVTD_ATTEST_BUILD_DIR := $(BUILD_DIR)/servtd_attest

‎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.19.100.3"
31+
#define STRFILEVER "1.20.100.2"
3232
#define COPYRIGHT "Copyright (C) 2023 Intel Corporation"
33-
#define FILEVER 1,19,100,3
34-
#define PRODUCTVER 1,19,100,3
35-
#define STRPRODUCTVER "1.19.100.3"
33+
#define FILEVER 1,20,100,2
34+
#define PRODUCTVER 1,20,100,2
35+
#define STRPRODUCTVER "1.20.100.2"
3636
#define COMPANYNAME "Intel Corporation"
3737
#define PRODUCTNAME "Intel® Software Guard Extensions"
3838

39-
#define DEFAULT_QPL_VERSION "1.13.106.3"
40-
#define QUOTE_VERIFIER_VERSION "1.12.106.3"
41-
#define QUOTE_LOADER_VERSION "1.11.106.3"
42-
#define TDQE_WRAPPER_VERSION "1.14.106.3"
43-
#define PCE_WRAPPER_VERSION "1.14.106.3"
39+
#define DEFAULT_QPL_VERSION "1.13.107.2"
40+
#define QUOTE_VERIFIER_VERSION "1.13.100.2"
41+
#define QUOTE_LOADER_VERSION "1.11.107.2"
42+
#define TDQE_WRAPPER_VERSION "1.14.107.2"
43+
#define PCE_WRAPPER_VERSION "1.14.107.2"
4444

4545
#define QE3_VERSION "1.19.100.1"
46-
#define QVE_VERSION "1.19.100.1"
46+
#define QVE_VERSION "1.20.100.1"
4747
#define IDE_VERSION "1.19.100.1"
4848
#define TDQE_VERSION "1.19.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.19.zip
33-
set checksum_file=SHA256SUM_prebuilt_windows_dcap_1.19.cfg
34-
set server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.19/windows/
32+
set ae_file_name=prebuilt_windows_dcap_1.20.zip
33+
set checksum_file=SHA256SUM_prebuilt_windows_dcap_1.20.cfg
34+
set server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.20/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.19.tar.gz
36-
checksum_file=SHA256SUM_prebuilt_dcap_1.19.cfg
37-
server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.19/linux/
35+
ae_file_name=prebuilt_dcap_1.20.tar.gz
36+
checksum_file=SHA256SUM_prebuilt_dcap_1.20.cfg
37+
server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.20/linux/
3838
server_ae_url=$server_url_path/$ae_file_name
3939
server_checksum_url=$server_url_path/$checksum_file
4040

‎QuoteGeneration/installer/linux/common/libsgx-dcap-quote-verify/BOMs/libsgx-dcap-ql-dev-qvinc.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
DeliveryName InstallName FileCheckSum FileFeature FileOwner
22
<deliverydir>/dcap_quoteverify/inc/sgx_dcap_quoteverify.h <installdir>/include/sgx_dcap_quoteverify.h 0 main STP
33
<deliverydir>/QvE/Include/sgx_qve_header.h <installdir>/include/sgx_qve_header.h 0 main STP
4+
<deliverydir>/appraisal/qal/sgx_dcap_qal.h <installdir>/include/sgx_dcap_qal.h 0 main STP

‎QuoteGeneration/installer/linux/common/libsgx-dcap-quote-verify/BOMs/libsgx-dcap-qvl.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
DeliveryName InstallName FileCheckSum FileFeature FileOwner
22
<deliverydir>/build/linux/libsgx_dcap_quoteverify.so <installdir>/lib/libsgx_dcap_quoteverify.so 0 main STP
3+
<deliverydir>/build/linux/tee_appraisal_policy.wasm <installdir>/share/sgx/tee_appraisal_policy.wasm 0 main STP

‎QuoteGeneration/installer/linux/common/libsgx-dcap-quote-verify/Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ PACKAGES=$(notdir $(wildcard $(PACKAGE_ROOT_FOLDER)/*))
3636

3737
USR_LIB_PATH=/usr/$(notdir $(shell gcc -print-multi-os-directory))/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2> /dev/null)
3838
USR_INC_PATH=/usr/$(INC_DIR)
39+
USR_SHARE_PATH=/usr/$(SHARE_DIR)
3940

4041
USR_LIB_VER=1.0.0
4142
SPLIT_VERSION=$(word $2,$(subst ., ,$1))
@@ -46,6 +47,7 @@ install: $(PACKAGES)
4647
cd $(shell readlink -m $(DESTDIR)/$(DCAP_QVL_PACKAGE_NAME)/$(USR_LIB_PATH)) && \
4748
mv libsgx_dcap_quoteverify.so libsgx_dcap_quoteverify.so.$(USR_LIB_VER) && \
4849
ln -fs libsgx_dcap_quoteverify.so.$(USR_LIB_VER) libsgx_dcap_quoteverify.so.$(call SPLIT_VERSION,$(USR_LIB_VER),1)
50+
install -d $(shell readlink -m $(DESTDIR)/$(DCAP_QVL_DEV_PACKAGE_NAME)/$(USR_LIB_PATH))
4951
cd $(shell readlink -m $(DESTDIR)/$(DCAP_QVL_DEV_PACKAGE_NAME)/$(USR_LIB_PATH)) && \
5052
ln -fs libsgx_dcap_quoteverify.so.$(call SPLIT_VERSION,$(USR_LIB_VER),1) libsgx_dcap_quoteverify.so
5153

@@ -56,5 +58,7 @@ $(PACKAGES):
5658
mv $(PACKAGE_ROOT_FOLDER)/$@/$(LIB_DIR)/*.so $(DESTDIR)/$@/$(USR_LIB_PATH))
5759
$(if $(wildcard $(PACKAGE_ROOT_FOLDER)/$@/$(INC_DIR)/.*), \
5860
install -d $(shell readlink -m $(DESTDIR)/$@/$(USR_INC_PATH)) && \
59-
install -d $(shell readlink -m $(DESTDIR)/$@/$(USR_LIB_PATH)) && \
6061
mv $(PACKAGE_ROOT_FOLDER)/$@/$(INC_DIR)/* $(DESTDIR)/$@/$(USR_INC_PATH))
62+
$(if $(wildcard $(PACKAGE_ROOT_FOLDER)/$@/$(SHARE_DIR)/.*), \
63+
install -d $(shell readlink -m $(DESTDIR)/$@/$(USR_SHARE_PATH)) && \
64+
mv $(PACKAGE_ROOT_FOLDER)/$@/$(SHARE_DIR)/* $(DESTDIR)/$@/$(USR_SHARE_PATH))

0 commit comments

Comments
 (0)