Skip to content

Commit e945c58

Browse files
lllyllly
committed
Intel(R) SGX DCAP 1.21 Release
Upgraded Intel DCAP Ring3 Abstraction Layer(R3AAL) library to support ConfigFS-TSM as communication channel between host and guest for TDX remote attestation. Upgraded Intel DCAP Quote Verification Enclave to integrate OpenSSL/SgxSSL 3.0.13. Upgraded new TDX attestation result “TD_RELAUNCH_ADVISED” in Intel DCAP Quote. Verification Library(QVL) and Appraisal Engine. Fixed bugs. Signed-off-by: Li, Xun <xun.li@intel.com>
1 parent 14c8002 commit e945c58

File tree

160 files changed

+3242
-5173
lines changed

Some content is hidden

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

160 files changed

+3242
-5173
lines changed

‎.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[submodule "QuoteVerification/QVL"]
22
path = QuoteVerification/QVL
33
url = https://github.com/intel/SGX-TDX-DCAP-QuoteVerificationLibrary.git
4-
branch = DCAP/1.20
4+
branch = DCAP/1.21
55
[submodule "QuoteVerification/QuoteVerificationService"]
66
path = QuoteVerification/QuoteVerificationService
77
url = https://github.com/intel/SGX-TDX-DCAP-QuoteVerificationService.git
8-
branch = stable
8+
branch = DCAP/1.21
99
[submodule "external/wasm-micro-runtime"]
1010
path = external/wasm-micro-runtime
1111
url = https://github.com/bytecodealliance/wasm-micro-runtime.git

‎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.20/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.21/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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,12 @@ SGX_DEBUG ?= 0
6868

6969
ifndef SERVTD_ATTEST
7070
ifneq ($(origin SGX_SDK),file)
71-
include $(SGX_SDK)/buildenv.mk
72-
else
73-
$(info You may need to set environment variables if the SGX SDK is installed.)
74-
$(info Use a command like 'source /opt/intel/sgxsdk/environment')
71+
include $(SGX_SDK)/buildenv.mk
72+
else
73+
ifneq ($(SDK_NOT_REQUIRED), 1)
74+
$(info You may need to set environment variables if the SGX SDK is installed.)
75+
$(info Use a command like 'source /opt/intel/sgxsdk/environment')
76+
endif
7577
endif
7678
endif
7779

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

Lines changed: 11 additions & 11 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.20.100.2"
32-
#define COPYRIGHT "Copyright (C) 2023 Intel Corporation"
33-
#define FILEVER 1,20,100,2
34-
#define PRODUCTVER 1,20,100,2
35-
#define STRPRODUCTVER "1.20.100.2"
31+
#define STRFILEVER "1.21.100.3"
32+
#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"
3636
#define COMPANYNAME "Intel Corporation"
3737
#define PRODUCTNAME "Intel® Software Guard Extensions"
3838

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"
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"
4444

4545
#define QE3_VERSION "1.19.100.1"
46-
#define QVE_VERSION "1.20.100.1"
46+
#define QVE_VERSION "1.21.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.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/
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/
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.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/
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/
3838
server_ae_url=$server_url_path/$ae_file_name
3939
server_checksum_url=$server_url_path/$checksum_file
4040

‎QuoteGeneration/installer/linux/common/sgx-dcap-pccs/BOMs/sgx-dcap-pccs.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,13 @@ DeliveryName InstallName FileCheckSum FileFeature FileOwner
4343
<deliverydir>/pccs/middleware/auth.js <installdir>/middleware/auth.js 0 main STP
4444
<deliverydir>/pccs/middleware/error.js <installdir>/middleware/error.js 0 main STP
4545
<deliverydir>/pccs/middleware/addRequestId.js <installdir>/middleware/addRequestId.js 0 main STP
46+
<deliverydir>/pccs/middleware/filterDuplicatedParams.js <installdir>/middleware/filterDuplicatedParams.js 0 main STP
4647
<deliverydir>/pccs/migrations/00_db_initialize.up.sql <installdir>/migrations/00_db_initialize.up.sql 0 main STP
4748
<deliverydir>/pccs/migrations/01_db_version_1.js <installdir>/migrations/01_db_version_1.js 0 main STP
4849
<deliverydir>/pccs/migrations/02_db_version_2.js <installdir>/migrations/02_db_version_2.js 0 main STP
4950
<deliverydir>/pccs/migrations/03_db_version_3.js <installdir>/migrations/03_db_version_3.js 0 main STP
5051
<deliverydir>/pccs/migrations/04_db_version_4.js <installdir>/migrations/04_db_version_4.js 0 main STP
52+
<deliverydir>/pccs/migrations/05_db_version_5.js <installdir>/migrations/05_db_version_5.js 0 main STP
5153
<deliverydir>/pccs/pcs_client/pcs_client.js <installdir>/pcs_client/pcs_client.js 0 main STP
5254
<deliverydir>/pccs/routes/index.js <installdir>/routes/index.js 0 main STP
5355
<deliverydir>/pccs/services/identityService.js <installdir>/services/identityService.js 0 main STP

‎QuoteGeneration/installer/linux/common/tdx-qgs/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ include installConfig
3434
PACKAGE_ROOT_FOLDER=pkgroot
3535
PACKAGES=$(notdir $(wildcard $(PACKAGE_ROOT_FOLDER)/*))
3636

37+
VAR_OPT_PATH=/var/opt/qgsd
3738
QGSD_CONF_NAME=$(if $(wildcard /run/systemd/system/.*),qgsd.service,$(if $(wildcard /etc/init/.*),qgsd.conf,))
3839
QGSD_CONF_DEL=$(if $(wildcard /run/systemd/system/.*),qgsd.conf,$(if $(wildcard /etc/init/.*),qgsd.service,))
3940
QGSD_CONF_PATH=$(if $(wildcard /run/systemd/system/.*),$(if $(wildcard /lib/systemd/system/.*),/lib/systemd/system,/usr/lib/systemd/system),$(if $(wildcard /etc/init/.*),/etc/init/))
@@ -52,6 +53,7 @@ endif
5253
default:
5354

5455
install: $(PACKAGES)
56+
install -d $(shell readlink -m $(DESTDIR)/$(VAR_OPT_PATH))
5557
install -d $(shell readlink -m $(DESTDIR)/$(QGSD_CONF_PATH))
5658
sed -e "s:@qgs_folder@:$(TDX_QGS_PACKAGE_PATH)/$(TDX_QGS_PACKAGE_NAME):" \
5759
$(DESTDIR)/$(TDX_QGS_PACKAGE_PATH)/$(TDX_QGS_PACKAGE_NAME)/$(QGSD_CONF_NAME) \

‎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.23)
12+
Recommends: libsgx-dcap-quote-verify(>= @dep_version@), libsgx-quote-ex(>= 2.24)
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.23)
18+
Depends: libsgx-dcap-ql (= @dep_version@), libsgx-headers (>= 2.24)
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.23)
12+
Recommends: libsgx-ae-qve (>= @dep_version@), libsgx-urts (>= 2.24)
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.23)
18+
Depends: libsgx-dcap-quote-verify (= @dep_version@), libsgx-headers (>= 2.24)
1919
Description: Intel(R) Software Guard Extensions Data Center Attestation Primitives For Developers

0 commit comments

Comments
 (0)