Skip to content

Commit 65eb9c9

Browse files
lzha101lzha101
committed
Intel(R) SGX DCAP 1.12 Release
Upgraded Intel(R) Integrated Performance Primitives (IPP) Cryptography library to version 2021 update 3. Upgraded Intel(R) SGX Architecture Enclaves based on new IPP crypto library. Added support in Intel(R) QPL to retrieve SGX ECDSA quote verification endorsements from Intel(R) PCS. Updated SGX QVL and QvE to support CRL in different encoding. Updated SGX QVL and QvE to support CRL in different encoding. Fixed bugs. Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>
1 parent 88c8bb6 commit 65eb9c9

File tree

110 files changed

+2159
-1394
lines changed

Some content is hidden

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

110 files changed

+2159
-1394
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CUR_MKFILE:= $(lastword $(MAKEFILE_LIST))
3535

3636
all: QuoteGeneration QuoteVerification PCKCertSelection PCKRetrievalTool
3737

38-
QuoteGeneration:
38+
QuoteGeneration: QuoteVerification
3939
$(MAKE) -C QuoteGeneration
4040

4141
QuoteVerification:

‎QuoteGeneration/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ For Windows* OS
3737
**NOTE**:`sgx_dcap_dev.inf` is for Windows* Server 2016 LTSC and `sgx_dcap.inf` is for Windows* Server 2019 LTSC.
3838

3939
## How to install
40-
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.11/windows/docs/Intel_SGX_DCAP_Windows_SW_Installation_Guide.pdf) to install the right packages on your platform.
40+
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.12/windows/docs/Intel_SGX_DCAP_Windows_SW_Installation_Guide.pdf) to install the right packages on your platform.
4141

4242

4343
For Linux* OS

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,14 @@
2828
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*
3030
*/
31-
#define STRFILEVER "1.11.100.2"
32-
#define COPYRIGHT "Copyright (C) 2021 Intel Corporation"
33-
#define FILEVER 1,11,100,2
34-
#define PRODUCTVER 1,11,100,2
35-
#define STRPRODUCTVER "1.11.100.2"
31+
#define STRFILEVER "1.12.100.3"
32+
#define COPYRIGHT "Copyright (C) 2020 Intel Corporation"
33+
#define FILEVER 1,12,100,3
34+
#define PRODUCTVER 1,12,100,3
35+
#define STRPRODUCTVER "1.12.100.3"
3636
#define COMPANYNAME "Intel Corporation"
3737
#define PRODUCTNAME "Intel® Software Guard Extensions"
38+
39+
#define DEFAULT_QPL_VERSION "1.11.101.1"
40+
#define QUOTE_VERIFIER_VERSION "1.11.101.1"
41+
#define QUOTE_LOADER_VERSION "1.11.101.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.11.zip
33-
set checksum_file=SHA256SUM_prebuilt_windows_dcap_1.11.cfg
34-
set server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.11/windows/
32+
set ae_file_name=prebuilt_windows_dcap_1.12.zip
33+
set checksum_file=SHA256SUM_prebuilt_windows_dcap_1.12.cfg
34+
set server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.12/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.11.tar.gz
36-
checksum_file=SHA256SUM_prebuilt_dcap_1.11.cfg
37-
server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.11/linux
35+
ae_file_name=prebuilt_dcap_1.12.tar.gz
36+
checksum_file=SHA256SUM_prebuilt_dcap_1.12.cfg
37+
server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.12/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-default-qpl/createTarball.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ python ${SCRIPT_DIR}/gen_source.py --bom=BOMs/libsgx-dcap-default-qpl-package.tx
5555
python ${SCRIPT_DIR}/gen_source.py --bom=../licenses/BOM_license.txt --cleanup=false
5656

5757
# Create the tarball
58-
SGX_VERSION=$(awk '/STRFILEVER/ {print $3}' ${ROOT_DIR}/common/inc/internal/se_version.h|sed 's/^\"\(.*\)\"$/\1/')
58+
SGX_VERSION=$(awk '/DEFAULT_QPL_VERSION/ {print $3}' ${ROOT_DIR}/common/inc/internal/se_version.h|sed 's/^\"\(.*\)\"$/\1/')
5959
pushd ${INSTALL_PATH} &> /dev/null
6060
sed -i "s/USR_LIB_VER=.*/USR_LIB_VER=${SGX_VERSION}/" Makefile
6161
tar -zcvf ${TARBALL_NAME} *

‎QuoteGeneration/installer/linux/common/libsgx-dcap-ql/createTarball.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ python ${SCRIPT_DIR}/gen_source.py --bom=BOMs/libsgx-dcap-ql-package.txt --clea
5858
python ${SCRIPT_DIR}/gen_source.py --bom=../licenses/BOM_license.txt --cleanup=false
5959

6060
# Create the tarball
61-
SGX_VERSION=$(awk '/STRFILEVER/ {print $3}' ${ROOT_DIR}/common/inc/internal/se_version.h|sed 's/^\"\(.*\)\"$/\1/')
61+
SGX_VERSION=$(awk '/QUOTE_LOADER_VERSION/ {print $3}' ${ROOT_DIR}/common/inc/internal/se_version.h|sed 's/^\"\(.*\)\"$/\1/')
6262
pushd ${INSTALL_PATH} &> /dev/null
6363
sed -i "s/USR_LIB_VER=.*/USR_LIB_VER=${SGX_VERSION}/" Makefile
6464
tar -zcvf ${TARBALL_NAME} *

‎QuoteGeneration/installer/linux/common/libsgx-dcap-quote-verify/createTarball.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ python ${SCRIPT_DIR}/gen_source.py --bom=BOMs/libsgx-dcap-qvl-package.txt --cle
5959
python ${SCRIPT_DIR}/gen_source.py --bom=../licenses/BOM_license.txt --cleanup=false
6060

6161
# Create the tarball
62-
SGX_VERSION=$(awk '/STRFILEVER/ {print $3}' ${ROOT_DIR}/common/inc/internal/se_version.h|sed 's/^\"\(.*\)\"$/\1/')
62+
SGX_VERSION=$(awk '/QUOTE_VERIFIER_VERSION/ {print $3}' ${ROOT_DIR}/common/inc/internal/se_version.h|sed 's/^\"\(.*\)\"$/\1/')
6363
pushd ${INSTALL_PATH} &> /dev/null
6464
sed -i "s/USR_LIB_VER=.*/USR_LIB_VER=${SGX_VERSION}/" Makefile
6565
tar -zcvf ${TARBALL_NAME} *

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ DeliveryName InstallName FileCheckSum FileFeature FileOwner
1111
<deliverydir>/pccs/controllers/refreshController.js <installdir>/controllers/refreshController.js 0 main STP
1212
<deliverydir>/pccs/controllers/rootcacrlController.js <installdir>/controllers/rootcacrlController.js 0 main STP
1313
<deliverydir>/pccs/controllers/tcbinfoController.js <installdir>/controllers/tcbinfoController.js 0 main STP
14+
<deliverydir>/pccs/controllers/crlController.js <installdir>/controllers/crlController.js 0 main STP
1415
<deliverydir>/pccs/dao/models/fmspc_tcbs.js <installdir>/dao/models/fmspc_tcbs.js 0 main STP
1516
<deliverydir>/pccs/dao/models/index.js <installdir>/dao/models/index.js 0 main STP
1617
<deliverydir>/pccs/dao/models/pck_cert.js <installdir>/dao/models/pck_cert.js 0 main STP
@@ -21,8 +22,8 @@ DeliveryName InstallName FileCheckSum FileFeature FileOwner
2122
<deliverydir>/pccs/dao/models/platform_tcbs.js <installdir>/dao/models/platform_tcbs.js 0 main STP
2223
<deliverydir>/pccs/dao/models/platforms_registered.js <installdir>/dao/models/platforms_registered.js 0 main STP
2324
<deliverydir>/pccs/dao/models/platforms.js <installdir>/dao/models/platforms.js 0 main STP
24-
<deliverydir>/pccs/dao/models/qe_identities.js <installdir>/dao/models/qe_identities.js 0 main STP
25-
<deliverydir>/pccs/dao/models/qve_identities.js <installdir>/dao/models/qve_identities.js 0 main STP
25+
<deliverydir>/pccs/dao/models/enclave_identities.js <installdir>/dao/models/enclave_identities.js 0 main STP
26+
<deliverydir>/pccs/dao/models/crl_cache.js <installdir>/dao/models/crl_cache.js 0 main STP
2627
<deliverydir>/pccs/dao/fmspcTcbDao.js <installdir>/dao/fmspcTcbDao.js 0 main STP
2728
<deliverydir>/pccs/dao/pckCertchainDao.js <installdir>/dao/pckCertchainDao.js 0 main STP
2829
<deliverydir>/pccs/dao/pckcertDao.js <installdir>/dao/pckcertDao.js 0 main STP
@@ -32,15 +33,16 @@ DeliveryName InstallName FileCheckSum FileFeature FileOwner
3233
<deliverydir>/pccs/dao/platformsDao.js <installdir>/dao/platformsDao.js 0 main STP
3334
<deliverydir>/pccs/dao/platformsRegDao.js <installdir>/dao/platformsRegDao.js 0 main STP
3435
<deliverydir>/pccs/dao/platformTcbsDao.js <installdir>/dao/platformTcbsDao.js 0 main STP
35-
<deliverydir>/pccs/dao/qeidentityDao.js <installdir>/dao/qeidentityDao.js 0 main STP
36-
<deliverydir>/pccs/dao/qveidentityDao.js <installdir>/dao/qveidentityDao.js 0 main STP
36+
<deliverydir>/pccs/dao/enclaveIdentityDao.js <installdir>/dao/enclaveIdentityDao.js 0 main STP
37+
<deliverydir>/pccs/dao/crlCacheDao.js <installdir>/dao/crlCacheDao.js 0 main STP
3738
<deliverydir>/pccs/lib/libPCKCertSelection.so <installdir>/lib/libPCKCertSelection.so 0 main STP
3839
<deliverydir>/pccs/lib_wrapper/pcklib_wrapper.js <installdir>/lib_wrapper/pcklib_wrapper.js 0 main STP
3940
<deliverydir>/pccs/middleware/auth.js <installdir>/middleware/auth.js 0 main STP
4041
<deliverydir>/pccs/middleware/error.js <installdir>/middleware/error.js 0 main STP
4142
<deliverydir>/pccs/middleware/addRequestId.js <installdir>/middleware/addRequestId.js 0 main STP
4243
<deliverydir>/pccs/migrations/00_db_initialize.up.sql <installdir>/migrations/00_db_initialize.up.sql 0 main STP
4344
<deliverydir>/pccs/migrations/01_db_version_1.js <installdir>/migrations/01_db_version_1.js 0 main STP
45+
<deliverydir>/pccs/migrations/02_db_version_2.js <installdir>/migrations/02_db_version_2.js 0 main STP
4446
<deliverydir>/pccs/pcs_client/pcs_client.js <installdir>/pcs_client/pcs_client.js 0 main STP
4547
<deliverydir>/pccs/routes/index.js <installdir>/routes/index.js 0 main STP
4648
<deliverydir>/pccs/services/identityService.js <installdir>/services/identityService.js 0 main STP
@@ -54,6 +56,7 @@ DeliveryName InstallName FileCheckSum FileFeature FileOwner
5456
<deliverydir>/pccs/services/refreshService.js <installdir>/services/refreshService.js 0 main STP
5557
<deliverydir>/pccs/services/rootcacrlService.js <installdir>/services/rootcacrlService.js 0 main STP
5658
<deliverydir>/pccs/services/tcbinfoService.js <installdir>/services/tcbinfoService.js 0 main STP
59+
<deliverydir>/pccs/services/crlService.js <installdir>/services/crlService.js 0 main STP
5760
<deliverydir>/pccs/services/caching_modes/cachingMode.js <installdir>/services/caching_modes/cachingMode.js 0 main STP
5861
<deliverydir>/pccs/services/caching_modes/cachingModeManager.js <installdir>/services/caching_modes/cachingModeManager.js 0 main STP
5962
<deliverydir>/pccs/services/logic/commonCacheLogic.js <installdir>/services/logic/commonCacheLogic.js 0 main STP

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

0 commit comments

Comments
 (0)