Skip to content

Commit 71557c7

Browse files
lllyllly
committed
Intel(R) SGX DCAP 1.16 Release
Upgraded Intel SGX Quote Verification Enclave to integrate SgxSSL/OpenSSL version 1.1.1t Added new API in quote verification library to extract FMSPC (Family-Model-SteppingPlatform-CustomSKU) value from ECDSA quote Added Rust support for SGX ECDSA quote generation Added Linux kernel 5.19 support in TDX R3AAL (Ring 3 Attestation Abstraction Layer) Removed Protobuf in TDX QGS (Quote Generation Service) and R3AAL (Ring 3 Attestation Abstraction Layer) Fixed bugs Signed-off-by: Li, Xun <xun.li@intel.com>
1 parent cc582e8 commit 71557c7

File tree

287 files changed

+23402
-1369
lines changed

Some content is hidden

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

287 files changed

+23402
-1369
lines changed

‎Makefile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131

3232
CUR_MKFILE:= $(lastword $(MAKEFILE_LIST))
3333

34-
.PHONY: all clean rebuild QuoteGeneration QuoteVerification PCKCertSelection PCKRetrievalTool SGXPlatformRegistration
34+
.PHONY: all clean rebuild QuoteGeneration QuoteVerification PCKCertSelection PCKRetrievalTool SGXPlatformRegistration WinPle WinPleIntel
3535

36-
all: QuoteGeneration QuoteVerification PCKCertSelection PCKRetrievalTool SGXPlatformRegistration
36+
all: QuoteGeneration QuoteVerification PCKCertSelection PCKRetrievalTool SGXPlatformRegistration WinPle WinPleIntel
3737

3838
QuoteGeneration: QuoteVerification
3939
$(MAKE) -C QuoteGeneration
@@ -50,12 +50,20 @@ PCKRetrievalTool: QuoteGeneration
5050
SGXPlatformRegistration:
5151
$(MAKE) -C tools/SGXPlatformRegistration
5252

53+
WinPle:
54+
$(MAKE) -C driver/win/PLE
55+
56+
WinPleIntel:
57+
$(MAKE) -C driver/win/PLE INTEL_SIGNED=1
58+
5359
clean:
5460
$(MAKE) -C QuoteGeneration clean
5561
$(MAKE) -C QuoteVerification clean
5662
$(MAKE) -C tools/PCKCertSelection clean
5763
$(MAKE) -C tools/PCKRetrievalTool clean
5864
$(MAKE) -C tools/SGXPlatformRegistration clean
65+
$(MAKE) -C driver/win/PLE clean
66+
$(MAKE) -C driver/win/PLE INTEL_SIGNED=1 clean
5967

6068
rebuild:
6169
$(MAKE) -f $(CUR_MKFILE) clean

‎QuoteGeneration/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,13 @@ tdx_qgs deb_sgx_tdx_qgs_pkg:
117117
tdx_attest deb_sgx_tdx_attest_pkg:
118118
echo "Skip tdx_attest in ubuntu 18.04"
119119
else
120+
qgs_msg_lib:
121+
$(MAKE) -C quote_wrapper/qgs_msg_lib/linux
120122
tdx_logic: pce_logic
121123
$(MAKE) -C quote_wrapper/tdx_quote/linux
122-
tdx_qgs: tdx_logic
124+
tdx_qgs: tdx_logic qgs_msg_lib
123125
$(MAKE) -C quote_wrapper/qgs
124-
tdx_attest:
126+
tdx_attest: qgs_msg_lib
125127
$(MAKE) -C quote_wrapper/tdx_attest/linux
126128
deb_sgx_ae_tdqe_pkg: $(CHECK_OPT)
127129
./installer/linux/deb/libsgx-ae-tdqe/build.sh

‎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.15/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.16/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/common/inc/internal/se_version.h

Lines changed: 14 additions & 14 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.15.100.3"
32-
#define COPYRIGHT "Copyright (C) 2022 Intel Corporation"
33-
#define FILEVER 1,15,100,3
34-
#define PRODUCTVER 1,15,100,3
35-
#define STRPRODUCTVER "1.15.100.3"
31+
#define STRFILEVER "1.16.100.2"
32+
#define COPYRIGHT "Copyright (C) 2023 Intel Corporation"
33+
#define FILEVER 1,16,100,2
34+
#define PRODUCTVER 1,16,100,2
35+
#define STRPRODUCTVER "1.16.100.2"
3636
#define COMPANYNAME "Intel Corporation"
3737
#define PRODUCTNAME "Intel® Software Guard Extensions"
3838

39-
#define DEFAULT_QPL_VERSION "1.13.102.3"
40-
#define QUOTE_VERIFIER_VERSION "1.12.102.3"
41-
#define QUOTE_LOADER_VERSION "1.11.105.3"
42-
#define TDQE_WRAPPER_VERSION "1.14.102.3"
43-
#define PCE_WRAPPER_VERSION "1.14.102.3"
39+
#define DEFAULT_QPL_VERSION "1.13.103.2"
40+
#define QUOTE_VERIFIER_VERSION "1.12.103.2"
41+
#define QUOTE_LOADER_VERSION "1.11.106.2"
42+
#define TDQE_WRAPPER_VERSION "1.14.103.2"
43+
#define PCE_WRAPPER_VERSION "1.14.103.2"
4444

45-
#define QE3_VERSION "1.15.100.1"
46-
#define QVE_VERSION "1.15.100.1"
47-
#define IDE_VERSION "1.14.100.2"
48-
#define TDQE_VERSION "1.14.100.2"
45+
#define QE3_VERSION "1.16.100.1"
46+
#define QVE_VERSION "1.16.100.1"
47+
#define IDE_VERSION "1.16.100.1"
48+
#define TDQE_VERSION "1.16.100.1"

‎QuoteGeneration/common/src/se_thread.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131
#include "se_thread.h"
3232
#include "se_types.h"
33-
33+
#include "se_memcpy.h"
3434

3535
#if defined(_MSC_VER)
3636

@@ -68,7 +68,7 @@ void se_mutex_init(se_mutex_t* mutex)
6868
#endif
6969

7070
/* C doesn't allow `*mutex = PTHREAD_..._INITIALIZER'.*/
71-
memcpy(mutex, &tmp, sizeof(tmp));
71+
memcpy_s(mutex, sizeof(tmp), &tmp, sizeof(tmp));
7272
}
7373

7474
int se_mutex_lock(se_mutex_t* mutex) { return (0 == pthread_mutex_lock(mutex)); }
@@ -78,7 +78,7 @@ int se_mutex_destroy(se_mutex_t* mutex) { return (0 == pthread_mutex_destroy(mut
7878
void se_thread_cond_init(se_cond_t* cond)
7979
{
8080
se_cond_t tmp = PTHREAD_COND_INITIALIZER;
81-
memcpy(cond, &tmp, sizeof(tmp));
81+
memcpy_s(cond, sizeof(tmp), &tmp, sizeof(tmp));
8282
}
8383

8484
int se_thread_cond_wait(se_cond_t *cond, se_mutex_t *mutex){return (0 == pthread_cond_wait(cond, mutex));}

‎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.15.zip
33-
set checksum_file=SHA256SUM_prebuilt_windows_dcap_1.15.cfg
34-
set server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.15/windows/
32+
set ae_file_name=prebuilt_windows_dcap_1.16.zip
33+
set checksum_file=SHA256SUM_prebuilt_windows_dcap_1.16.cfg
34+
set server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.16/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.15.tar.gz
36-
checksum_file=SHA256SUM_prebuilt_dcap_1.15.cfg
37-
server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.15/linux/
35+
ae_file_name=prebuilt_dcap_1.16.tar.gz
36+
checksum_file=SHA256SUM_prebuilt_dcap_1.16.cfg
37+
server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.16/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.18)
12+
Recommends: libsgx-dcap-quote-verify(>= @dep_version@), libsgx-quote-ex(>= 2.19)
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.18)
18+
Depends: libsgx-dcap-ql (= @dep_version@), libsgx-headers (>= 2.19)
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.18)
12+
Recommends: libsgx-ae-qve (>= @dep_version@), libsgx-urts (>= 2.19)
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.18)
18+
Depends: libsgx-dcap-quote-verify (= @dep_version@), libsgx-headers (>= 2.19)
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.18), libsgx-ae-pce(>= 2.18), ${shlibs:Depends}, ${misc:Depends}
11+
Depends: libsgx-urts (>= 2.19), libsgx-ae-pce(>= 2.19), ${shlibs:Depends}, ${misc:Depends}
1212
Description: Intel(R) Software Guard Extensions Data Center Attestation Primitives

0 commit comments

Comments
 (0)