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 <[email protected]>
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

+4
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

+1-1
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

+17-2
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

+10-10
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

+3-3
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

+3-3
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

+2-2
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

+2-2
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

+1-1
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

+1-1
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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ Homepage: https://github.com/intel/SGXDataCenterAttestationPrimitives
88

99
Package: libsgx-tdx-logic
1010
Architecture: amd64
11-
Depends: libsgx-urts (>= 2.20), libsgx-pce-logic(>= @dep_version@), libsgx-ae-tdqe(>= @dep_version@), libsgx-ae-id-enclave(>= @dep_version@), ${shlibs:Depends}, ${misc:Depends}
11+
Depends: libsgx-urts (>= 2.21), libsgx-pce-logic(>= @dep_version@), libsgx-ae-tdqe(>= @dep_version@), libsgx-ae-id-enclave(>= @dep_version@), ${shlibs:Depends}, ${misc:Depends}
1212
Description: Intel(R) Trust Domain Extensions QE logic library
1313

1414
Package: libsgx-tdx-logic-dev
1515
Section: devel
1616
Architecture: amd64
17-
Depends: libsgx-tdx-logic (= @dep_version@), libsgx-headers (>= 2.20)
17+
Depends: libsgx-tdx-logic (= @dep_version@), libsgx-headers (>= 2.21)
1818
Description: Intel(R) Trust Domain Extensions QE logic library For Developers

‎QuoteGeneration/installer/linux/rpm/libsgx-dcap-ql/libsgx-dcap-ql.spec

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Release: 1%{?dist}
3737
Summary: Intel(R) Software Guard Extensions Data Center Attestation Primitives
3838
Group: Development/Libraries
3939
Requires: libsgx-qe3-logic >= %{version}-%{release} libsgx-pce-logic >= %{version}-%{release}
40-
Recommends: libsgx-dcap-quote-verify >= %{version}-%{release} libsgx-quote-ex >= 2.20
40+
Recommends: libsgx-dcap-quote-verify >= %{version}-%{release} libsgx-quote-ex >= 2.21
4141

4242
License: BSD License
4343
URL: https://github.com/intel/SGXDataCenterAttestationPrimitives
@@ -49,7 +49,7 @@ Intel(R) Software Guard Extensions Data Center Attestation Primitives
4949
%package devel
5050
Summary: Intel(R) Software Guard Extensions Data Center Attestation Primitives for Developers
5151
Group: Development/Libraries
52-
Requires: %{name} = %{version}-%{release} libsgx-headers >= 2.20
52+
Requires: %{name} = %{version}-%{release} libsgx-headers >= 2.21
5353

5454
%description devel
5555
Intel(R) Software Guard Extensions Data Center Attestation Primitives for Developers

‎QuoteGeneration/installer/linux/rpm/libsgx-dcap-quote-verify/libsgx-dcap-quote-verify.spec

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Version: @version@
3636
Release: 1%{?dist}
3737
Summary: Intel(R) Software Guard Extensions Data Center Attestation Primitives
3838
Group: Development/Libraries
39-
Recommends: libsgx-ae-qve >= %{version}-%{release} libsgx-urts >= 2.20
39+
Recommends: libsgx-ae-qve >= %{version}-%{release} libsgx-urts >= 2.21
4040

4141
License: BSD License
4242
URL: https://github.com/intel/SGXDataCenterAttestationPrimitives
@@ -48,7 +48,7 @@ Intel(R) Software Guard Extensions Data Center Attestation Primitives
4848
%package devel
4949
Summary: Intel(R) Software Guard Extensions Data Center Attestation Primitives for Developers
5050
Group: Development/Libraries
51-
Requires: %{name} = %{version}-%{release} libsgx-headers >= 2.20
51+
Requires: %{name} = %{version}-%{release} libsgx-headers >= 2.21
5252

5353
%description devel
5454
Intel(R) Software Guard Extensions Data Center Attestation Primitives for Developers

‎QuoteGeneration/installer/linux/rpm/libsgx-pce-logic/libsgx-pce-logic.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Version: @version@
3636
Release: 1%{?dist}
3737
Summary: Intel(R) Software Guard Extensions PCE logic
3838
Group: Development/Libraries
39-
Requires: libsgx-urts >= 2.20 libsgx-ae-pce >= 2.20
39+
Requires: libsgx-urts >= 2.21 libsgx-ae-pce >= 2.21
4040

4141
License: BSD License
4242
URL: https://github.com/intel/SGXDataCenterAttestationPrimitives

‎QuoteGeneration/installer/linux/rpm/libsgx-qe3-logic/libsgx-qe3-logic.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Version: @version@
3636
Release: 1%{?dist}
3737
Summary: Intel(R) Software Guard Extensions QE3 logic
3838
Group: Development/Libraries
39-
Requires: libsgx-urts >= 2.20 libsgx-ae-qe3 >= %{version}-%{release} libsgx-ae-id-enclave >= %{version}-%{release}
39+
Requires: libsgx-urts >= 2.21 libsgx-ae-qe3 >= %{version}-%{release} libsgx-ae-id-enclave >= %{version}-%{release}
4040

4141
License: BSD License
4242
URL: https://github.com/intel/SGXDataCenterAttestationPrimitives

‎QuoteGeneration/installer/linux/rpm/libsgx-tdx-logic/libsgx-tdx-logic.spec

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Version: @version@
3636
Release: 1%{?dist}
3737
Summary: Intel(R) Trust Domain Extensions QE logic library
3838
Group: Development/Libraries
39-
Requires: libsgx-urts >= 2.20 libsgx-ae-tdqe >= %{version}-%{release} libsgx-ae-id-enclave >= %{version}-%{release} libsgx-pce-logic >= %{version}-%{release}
39+
Requires: libsgx-urts >= 2.21 libsgx-ae-tdqe >= %{version}-%{release} libsgx-ae-id-enclave >= %{version}-%{release} libsgx-pce-logic >= %{version}-%{release}
4040

4141
License: BSD License
4242
URL: https://github.com/intel/SGXDataCenterAttestationPrimitives
@@ -49,7 +49,7 @@ Intel(R) Trust Domain Extensions QE logic library
4949
%package devel
5050
Summary: Intel(R) Trust Domain Extensions QE logic library For Developers
5151
Group: Development/Libraries
52-
Requires: %{name} = %{version}-%{release} libsgx-headers >= 2.20
52+
Requires: %{name} = %{version}-%{release} libsgx-headers >= 2.21
5353
%description devel
5454
Intel(R) Trust Domain Extensions QE logic library For Developers
5555
%prep

‎QuoteGeneration/installer/win/DCAP_Components.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set QGFOLDER="..\..\"
55
set QVFOLDER="%TOPFOLDER%\QuoteVerification"
66
set DEBUGFILEFOLDER="..\..\..\x64\Debug\"
77
set RELEASEFILEFOLDER="..\..\..\x64\Release\"
8-
set PACKAGETNAME=DCAP_Components.1.17.100.0
8+
set PACKAGETNAME=DCAP_Components.1.18.100.0
99
set pwd=%~dp0DCAP_Components
1010

1111
pushd "%~dp0"

‎QuoteGeneration/installer/win/DCAP_Components/DCAP_Components.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>DCAP_Components</id>
5-
<version>1.17.100.4</version>
5+
<version>1.18.100.1</version>
66
<title>DCAP Components</title>
77
<authors>Intel(R) SGX</authors>
88
<owners>Intel</owners>
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1010
<description>DCAP Components</description>
1111
<copyright>Copyright (C) 2022 Intel Corporation</copyright>
1212
<dependencies>
13-
<dependency id="SgxHeaders" version="2.19.100.4" />
13+
<dependency id="SgxHeaders" version="2.20.100.1" />
1414
</dependencies>
1515
</metadata>
1616
<files>

‎QuoteGeneration/pccs/container/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:20.04 AS builder
22

33
# DCAP version (github repo branch, tag or commit hash)
4-
ARG DCAP_VERSION=DCAP_1.17
4+
ARG DCAP_VERSION=DCAP_1.18
55

66
# update and install packages
77
RUN DEBIAN_FRONTEND=noninteractive \

‎QuoteGeneration/pce_wrapper/inc/sgx_pce.h

+3
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ typedef enum _sgx_ql_request_policy
7373
SGX_QL_PERSISTENT, ///< QE is initialized on first use and reused until process ends.
7474
SGX_QL_EPHEMERAL, ///< QE is initialized and terminated on every quote.
7575
///< If a previous QE exists, it is stopped & restarted before quoting.
76+
SGX_QL_EPHEMERAL_QVE_MULTI_THREAD, ///< Only used for quote verification, QvE is loaded per thread and be unloaded before function exit.
77+
SGX_QL_PERSISTENT_QVE_MULTI_THREAD, ///< Only used for quote verification, QvE is loaded per thread and be unloaded before thread exit.
78+
7679
SGX_QL_DEFAULT = SGX_QL_PERSISTENT
7780
} sgx_ql_request_policy_t;
7881

‎QuoteGeneration/psw/ae/data/prebuilt/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ The PCE is part of Intel(R) Software Guard Extensions for Linux\* OS which is pu
55
The QE3 is part of [Intel(R) Software Guard Extensions Data Center Attestation Primitives](https://github.com/intel/SGXDataCenterAttestationPrimitives/) Github repository. The libsgx_qe3.signed.so in prebuilt package is built by [qe3](https://github.com/intel/SGXDataCenterAttestationPrimitives/tree/master/QuoteGeneration/quote_wrapper/quote/enclave) with branch [sgx_2.19_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.19_reproducible) and signed by Intel.
66

77
# QVE source code
8-
The QVE is part of [Intel(R) Software Guard Extensions Data Center Attestation Primitives](https://github.com/intel/SGXDataCenterAttestationPrimitives/) Github repository. The libsgx_qve.signed.so in prebuilt package is built by [qve](https://github.com/intel/SGXDataCenterAttestationPrimitives/tree/master/QuoteVerification/QvE/Enclave) with branch [sgx_2.20_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.20_reproducible)and signed by Intel.
8+
The QVE is part of [Intel(R) Software Guard Extensions Data Center Attestation Primitives](https://github.com/intel/SGXDataCenterAttestationPrimitives/) Github repository. The libsgx_qve.signed.so in prebuilt package is built by [qve](https://github.com/intel/SGXDataCenterAttestationPrimitives/tree/master/QuoteVerification/QvE/Enclave) with branch [sgx_2.21_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.21_reproducible)and signed by Intel.
99

1010
# IDE source code
1111
The IDE is part of [Intel(R) Software Guard Extensions Data Center Attestation Primitives](https://github.com/intel/SGXDataCenterAttestationPrimitives/) Github repository. The libsgx_id_enclave.signed.so in prebuilt package is built by [id_enclave](https://github.com/intel/SGXDataCenterAttestationPrimitives/tree/master/QuoteGeneration/quote_wrapper/quote/id_enclave) with branch [sgx_2.19_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.19_reproducible) and signed by Intel.
1212

1313
# TDQE source code
14-
The TDQE is part of [Intel(R) Software Guard Extensions Data Center Attestation Primitives](https://github.com/intel/SGXDataCenterAttestationPrimitives/) Github repository. The libsgx_tdqe.signed.so in prebuilt package is built by [tdqe](https://github.com/intel/SGXDataCenterAttestationPrimitives/tree/master/QuoteGeneration/quote_wrapper/tdx_quote/enclave) with branch [sgx_2.19_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.19_reproducible) and signed by Intel.
14+
The TDQE is part of [Intel(R) Software Guard Extensions Data Center Attestation Primitives](https://github.com/intel/SGXDataCenterAttestationPrimitives/) Github repository. The libsgx_tdqe.signed.so in prebuilt package is built by [tdqe](https://github.com/intel/SGXDataCenterAttestationPrimitives/tree/master/QuoteGeneration/quote_wrapper/tdx_quote/enclave) with internal branch and signed by Intel.

‎QuoteGeneration/quote_wrapper/common/inc/sgx_quote_4.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
#pragma pack(push, 1)
4848

49-
#define TD_INFO_RESERVED_BYTES 112
49+
#define TD_INFO_RESERVED_BYTES_V1 112
5050
typedef struct _tee_info_t /* 512 bytes */
5151
{
5252
tee_attributes_t attributes; /* ( 0) TD's attributes */
@@ -56,7 +56,7 @@ typedef struct _tee_info_t /* 512 bytes */
5656
tee_measurement_t mr_owner; /* (112) Software defined ID for the guest TD's owner */
5757
tee_measurement_t mr_owner_config; /* (160) Software defined ID for owner-defined configuration of the guest TD, e.g., specific to the workload rather than the runtime or OS */
5858
tee_measurement_t rt_mr[4]; /* (208) Array of 4(TDX1: NUM_RTMRS is 4) runtime extendable measurement registers */
59-
uint8_t reserved[TD_INFO_RESERVED_BYTES]; /* (400) Reserved, must be zero */
59+
uint8_t reserved[TD_INFO_RESERVED_BYTES_V1]; /* (400) Reserved, must be zero */
6060
} tee_info_t;
6161

6262

@@ -66,7 +66,7 @@ typedef struct _tee_tcb_svn_t
6666
uint8_t tcb_svn[TEE_TCB_SVN_SIZE];
6767
} tee_tcb_svn_t;
6868

69-
#define TD_TEE_TCB_INFO_RESERVED_BYTES 111
69+
#define TD_TEE_TCB_INFO_RESERVED_BYTES_V1 111
7070
typedef struct _tee_tcb_info_t
7171
{
7272
uint8_t valid[8]; /* ( 0) Indicates TEE_TCB_INFO fields which are valid
@@ -77,7 +77,7 @@ typedef struct _tee_tcb_info_t
7777
tee_measurement_t mr_seam; /* ( 24) Measurement of the SEAM module */
7878
tee_measurement_t mr_seam_signer; /* ( 72) Measurement of SEAM module signer. (Not populated for Intel SEAM modules) */
7979
tee_attributes_t attributes; /* (120) Additional configuration attributes.(Not populated for Intel SEAM modules) */
80-
uint8_t reserved[TD_TEE_TCB_INFO_RESERVED_BYTES]; /* (128) Reserved, must be zero */
80+
uint8_t reserved[TD_TEE_TCB_INFO_RESERVED_BYTES_V1];/* (128) Reserved, must be zero */
8181
} tee_tcb_info_t;
8282

8383
/** The SGX_QL_SGX_QL_ALG_ECDSA_P256 specific data structure. Appears in the signature_data[] of the sgx_quote3_t
@@ -141,12 +141,12 @@ typedef struct _sgx_report2_body_t {
141141
typedef struct _sgx_quote4_t {
142142
sgx_quote4_header_t header; ///< 0: The quote header.
143143
sgx_report2_body_t report_body; ///< 48: The REPORT of the TD that is attesting remotely.
144-
uint32_t signature_data_len; ///< 656: The length of the signature_data. Varies depending on the type of sign_type.
144+
uint32_t signature_data_len; ///< 632: The length of the signature_data. Varies depending on the type of sign_type.
145145
#ifdef _MSC_VER
146146
#pragma warning(push)
147147
#pragma warning ( disable:4200 )
148148
#endif
149-
uint8_t signature_data[]; ///< 660: Contains the variable length containing the quote signature and support data for the signature.
149+
uint8_t signature_data[]; ///< 636: Contains the variable length containing the quote signature and support data for the signature.
150150
#ifdef _MSC_VER
151151
#pragma warning(pop)
152152
#endif

0 commit comments

Comments
 (0)