Skip to content

Commit 2562057

Browse files
lllyllly
committed
Intel(R) SGX DCAP 1.22 Release
Upgraded Intel DCAP Quote Verification Enclave to integrate OpenSSL/SgxSSL 3.0.14. Removed Intel DCAP PCCS from repository. Added Ubuntu* 24.04 LTS 64-bit Server support. Fixed bugs. Note that PCCS is not available from this release. Please follow DCAP installation guide to use `PCCSAdminTool` to retrieve the attestation collaterals or use old version PCCS. Signed-off-by: Li, Xun <xun.li@intel.com>
1 parent fa6631c commit 2562057

File tree

461 files changed

+8150
-57886
lines changed

Some content is hidden

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

461 files changed

+8150
-57886
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@
2323
/QuoteGeneration/build/
2424
**/Debug/
2525
**/Release/
26+
27+
#prebuilt binaries
28+
/prebuilt/

‎QuoteGeneration/Makefile

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,6 @@ deb_sgx_dcap_quote_verify_pkg: $(CHECK_OPT) qve_wrapper
8989
deb_sgx_dcap_default_qpl_pkg: qcnl_wrapper qpl_wrapper
9090
./installer/linux/deb/libsgx-dcap-default-qpl/build.sh
9191

92-
.PHONY: deb_sgx_dcap_pccs_pkg
93-
deb_sgx_dcap_pccs_pkg:
94-
$(MAKE) -C ../tools/PCKCertSelection/
95-
mkdir -p pccs/lib/
96-
cp ../tools/PCKCertSelection/out/libPCKCertSelection.so pccs/lib/
97-
./installer/linux/deb/sgx-dcap-pccs/build.sh
98-
9992
.PHONY: deb_sgx_ae_qe3_pkg
10093
deb_sgx_ae_qe3_pkg: $(CHECK_OPT)
10194
./installer/linux/deb/libsgx-ae-qe3/build.sh
@@ -160,8 +153,11 @@ deb_tee_appraisal_tool_pkg:
160153
./installer/linux/deb/tee-appraisal-tool/build.sh
161154

162155
.PHONY: deb_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
164-
@$(RM) -f ./installer/linux/deb/*.deb ./installer/linux/deb/*.ddeb
156+
deb_pkg: deb_sgx_pce_logic_pkg deb_sgx_qe3_logic_pkg deb_sgx_dcap_ql_pkg deb_sgx_dcap_quote_verify_pkg \
157+
deb_sgx_dcap_default_qpl_pkg deb_sgx_ae_qe3_pkg deb_sgx_ae_tdqe_pkg deb_sgx_ae_id_enclave_pkg \
158+
deb_sgx_ae_qve_pkg deb_sgx_tdx_logic_pkg deb_sgx_tdx_qgs_pkg deb_sgx_tdx_attest_pkg \
159+
deb_sgx_pck_id_retrieval_tool_pkg deb_sgx_ra_service_pkg deb_tee_appraisal_tool_pkg
160+
@$(RM) ./installer/linux/deb/*.deb ./installer/linux/deb/*.ddeb
165161
cp `find ./installer/linux/deb/ -name "*.deb" -o -name "*.ddeb"` ./installer/linux/deb/
166162
cp `find ../tools/PCKRetrievalTool/installer/deb/ -name "*.deb" -o -name "*.ddeb"` ./installer/linux/deb/
167163
cp `find ../tools/SGXPlatformRegistration/build/installer/ -name "*.deb" -o -name "*.ddeb"` ./installer/linux/deb/
@@ -174,13 +170,6 @@ rpm_sgx_dcap_ql_pkg: $(CHECK_OPT) pce_logic qe3_logic qve_wrapper
174170
rpm_sgx_dcap_default_qpl_pkg: qcnl_wrapper qpl_wrapper
175171
./installer/linux/rpm/libsgx-dcap-default-qpl/build.sh
176172

177-
.PHONY: rpm_sgx_dcap_pccs_pkg
178-
rpm_sgx_dcap_pccs_pkg:
179-
$(MAKE) -C ../tools/PCKCertSelection/
180-
mkdir -p pccs/lib/
181-
cp ../tools/PCKCertSelection/out/libPCKCertSelection.so pccs/lib/
182-
./installer/linux/rpm/sgx-dcap-pccs/build.sh
183-
184173
.PHONY: rpm_sgx_ae_qe3_pkg
185174
rpm_sgx_ae_qe3_pkg: $(CHECK_OPT)
186175
./installer/linux/rpm/libsgx-ae-qe3/build.sh
@@ -236,8 +225,11 @@ rpm_tee_appraisal_tool_pkg:
236225
./installer/linux/rpm/tee-appraisal-tool/build.sh
237226

238227
.PHONY: rpm_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
240-
@$(RM) -f ./installer/linux/rpm/*.rpm
228+
rpm_pkg: rpm_sgx_dcap_ql_pkg rpm_sgx_dcap_default_qpl_pkg rpm_sgx_ae_qe3_pkg rpm_sgx_ae_tdqe_pkg rpm_sgx_ae_id_enclave_pkg \
229+
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 \
230+
rpm_sgx_pce_logic_pkg rpm_sgx_qe3_logic_pkg rpm_sgx_pck_id_retrieval_tool_pkg rpm_sgx_ra_service_pkg \
231+
rpm_tee_appraisal_tool_pkg
232+
@$(RM) ./installer/linux/rpm/*.rpm
241233
cp `find ./installer/linux/rpm/ -name "*.rpm"` ./installer/linux/rpm/
242234
cp `find ../tools/PCKRetrievalTool/installer/rpm/ -name "*.rpm"` ./installer/linux/rpm/
243235
cp `find ../tools/SGXPlatformRegistration/build/installer/ -name "*.rpm"` ./installer/linux/rpm/
@@ -255,10 +247,10 @@ clean:
255247
$(MAKE) -C ../QuoteVerification clean
256248
$(MAKE) -C ../tools/PCKRetrievalTool clean
257249
$(MAKE) -C ../tools/SGXPlatformRegistration clean
258-
@$(RM) -rf ./build/
259-
@$(RM) -f ./installer/linux/deb/*.deb
260-
@$(RM) -f ./installer/linux/deb/*.ddeb
261-
@$(RM) -f ./installer/linux/rpm/*.rpm
250+
@$(RM) -r ./build/
251+
@$(RM) ./installer/linux/deb/*.deb
252+
@$(RM) ./installer/linux/deb/*.ddeb
253+
@$(RM) ./installer/linux/rpm/*.rpm
262254
./installer/linux/deb/libsgx-dcap-ql/clean.sh
263255
./installer/linux/deb/libsgx-dcap-quote-verify/clean.sh
264256
./installer/linux/deb/libsgx-ae-qe3/clean.sh
@@ -271,7 +263,6 @@ clean:
271263
./installer/linux/deb/tdx-qgs/clean.sh
272264
./installer/linux/deb/libtdx-attest/clean.sh
273265
./installer/linux/deb/libsgx-dcap-default-qpl/clean.sh
274-
./installer/linux/deb/sgx-dcap-pccs/clean.sh
275266
../tools/PCKRetrievalTool/installer/deb/sgx-pck-id-retrieval-tool/clean.sh
276267
./installer/linux/deb/tee-appraisal-tool/clean.sh
277268
./installer/linux/rpm/libsgx-dcap-ql/clean.sh
@@ -286,7 +277,6 @@ clean:
286277
./installer/linux/rpm/tdx-qgs/clean.sh
287278
./installer/linux/rpm/libtdx-attest/clean.sh
288279
./installer/linux/rpm/libsgx-dcap-default-qpl/clean.sh
289-
./installer/linux/rpm/sgx-dcap-pccs/clean.sh
290280
../tools/PCKRetrievalTool/installer/rpm/sgx-pck-id-retrieval-tool/clean.sh
291281
./installer/linux/rpm/tee-appraisal-tool/clean.sh
292282

‎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.21/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.22/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: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,28 @@ my-dir = $(call parent-dir,$(lastword $(MAKEFILE_LIST)))
4848
ROOT_DIR := $(call my-dir)
4949
COMMON_DIR := $(ROOT_DIR)/common
5050

51-
SGX_VER:= $(shell awk '$$2 ~ /STRFILEVER/ { print substr($$3, 2, length($$3) - 2); }' $(COMMON_DIR)/inc/internal/se_version.h)
52-
SGX_MAJOR_VER:= $(shell echo $(SGX_VER) |awk -F. '{print $$1}')
53-
SPLIT_VERSION=$(word $2,$(subst ., ,$1))
51+
#--------------------------------------------------------------------------------------
52+
# Function: get_full_version
53+
# Arguments: 1: the version name of library
54+
# Returns: Return the full version.
55+
#---------------------------------------------------------------------------------------
56+
get_full_version = $(shell awk '$$2 ~ /$1/ { print substr($$3, 2, length($$3) - 2); }' $(COMMON_DIR)/inc/internal/se_version.h)
57+
58+
#--------------------------------------------------------------------------------------
59+
# Function: get_major_version
60+
# Arguments: 1: the version name of library
61+
# Returns: Return the major version.
62+
#---------------------------------------------------------------------------------------
63+
get_major_version = $(word 1,$(subst ., ,$(call get_full_version,$1)))
64+
65+
SGX_VER:= $(call get_full_version,STRFILEVER)
66+
SGX_MAJOR_VER:= $(call get_major_version,STRFILEVER)
67+
68+
# If the value of _FORTIFY_SOURCE is greater than 2, use the value, else use 2.
69+
FORTIFY_SOURCE_VAL:= $(lastword $(sort $(word 2,$(subst =, ,$(filter -D_FORTIFY_SOURCE=%,$(CFLAGS)))) 2))
5470

5571
CP := cp -f
72+
LN := ln -sf
5673
MKDIR := mkdir -p
5774
STRIP := strip
5875
OBJCOPY := objcopy
@@ -122,7 +139,7 @@ ifdef DEBUG
122139
COMMON_FLAGS += -O0 -ggdb -DDEBUG -UNDEBUG
123140
COMMON_FLAGS += -DSE_DEBUG_LEVEL=SE_TRACE_DEBUG -DDEBUG_MODE=1
124141
else
125-
COMMON_FLAGS += -O2 -D_FORTIFY_SOURCE=2 -UDEBUG -DNDEBUG
142+
COMMON_FLAGS += -O2 -D_FORTIFY_SOURCE=$(FORTIFY_SOURCE_VAL) -UDEBUG -DNDEBUG
126143
endif
127144

128145
ifdef SE_SIM

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2011-2021 Intel Corporation. All rights reserved.
2+
* Copyright (C) 2011-2024 Intel Corporation. All rights reserved.
33
*
44
* Redistribution and use in source and binary forms, with or without
55
* modification, are permitted provided that the following conditions
@@ -28,21 +28,22 @@
2828
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*
3030
*/
31-
#define STRFILEVER "1.21.100.3"
31+
#define STRFILEVER "1.22.100.3"
3232
#define COPYRIGHT "Copyright (C) 2024 Intel Corporation"
33-
#define FILEVER 1,21,100,3
34-
#define PRODUCTVER 1,21,100,3
35-
#define STRPRODUCTVER "1.21.100.3"
33+
#define FILEVER 1,22,100,3
34+
#define PRODUCTVER 1,22,100,3
35+
#define STRPRODUCTVER "1.22.100.3"
3636
#define COMPANYNAME "Intel Corporation"
3737
#define PRODUCTNAME "Intel® Software Guard Extensions"
3838

39-
#define DEFAULT_QPL_VERSION "1.13.108.3"
40-
#define QUOTE_VERIFIER_VERSION "1.13.101.3"
41-
#define QUOTE_LOADER_VERSION "1.11.108.3"
42-
#define TDQE_WRAPPER_VERSION "1.14.108.3"
43-
#define PCE_WRAPPER_VERSION "1.14.108.3"
39+
#define DEFAULT_QPL_VERSION "1.13.109.3"
40+
#define QUOTE_VERIFIER_VERSION "1.13.102.3"
41+
#define QUOTE_LOADER_VERSION "1.11.109.3"
42+
#define TDQE_WRAPPER_VERSION "1.14.109.3"
43+
#define PCE_WRAPPER_VERSION "1.14.109.3"
4444

45-
#define QE3_VERSION "1.19.100.1"
46-
#define QVE_VERSION "1.21.100.1"
47-
#define IDE_VERSION "1.19.100.1"
48-
#define TDQE_VERSION "1.19.100.1"
45+
#define QE3_VERSION "1.22.100.1"
46+
#define QVE_VERSION "1.22.100.1"
47+
#define IDE_VERSION "1.22.100.1"
48+
#define TDQE_VERSION "1.22.100.1"
49+
#define QAE_VERSION "1.22.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.21.zip
33-
set checksum_file=SHA256SUM_prebuilt_windows_dcap_1.21.cfg
34-
set server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.21/windows/
32+
set ae_file_name=prebuilt_windows_dcap_1.22.zip
33+
set checksum_file=SHA256SUM_prebuilt_windows_dcap_1.22.cfg
34+
set server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.22/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: 5 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.21.tar.gz
36-
checksum_file=SHA256SUM_prebuilt_dcap_1.21.cfg
37-
server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.21/linux/
35+
ae_file_name=prebuilt_dcap_1.22.tar.gz
36+
checksum_file=SHA256SUM_prebuilt_dcap_1.22.cfg
37+
server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.22/linux/
3838
server_ae_url=$server_url_path/$ae_file_name
3939
server_checksum_url=$server_url_path/$checksum_file
4040

@@ -61,6 +61,8 @@ if [ $? -ne 0 ]; then
6161
fi
6262

6363
tar -zxf $ae_file_name
64+
cp -f -r prebuilt ..
65+
rm -f -r prebuilt
6466
rm -f $ae_file_name
6567
rm -f $checksum_file
6668

‎QuoteGeneration/installer/linux/common/libsgx-ae-id-enclave/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2011-2021 Intel Corporation. All rights reserved.
2+
# Copyright (C) 2011-2022 Intel Corporation. All rights reserved.
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions

‎QuoteGeneration/installer/linux/common/libsgx-ae-id-enclave/createTarball.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (C) 2011-2021 Intel Corporation. All rights reserved.
3+
# Copyright (C) 2011-2022 Intel Corporation. All rights reserved.
44
#
55
# Redistribution and use in source and binary forms, with or without
66
# modification, are permitted provided that the following conditions

‎QuoteGeneration/installer/linux/common/libsgx-ae-tdqe/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2011-2021 Intel Corporation. All rights reserved.
2+
# Copyright (C) 2011-2019 Intel Corporation. All rights reserved.
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions

0 commit comments

Comments
 (0)