Skip to content

Commit 4b2b8fc

Browse files
lllyllly
committed
Intel(R) SGX DCAP 1.12.1 Release
Upgraded Intel(R) ECDSA Quote Verification Enclave to integrate SgxSSL/OpenSSL version 1.1.1l Fixed bugs Signed-off-by: Li, Xun <xun.li@intel.com>
1 parent 5a94eb0 commit 4b2b8fc

File tree

22 files changed

+131
-30
lines changed

22 files changed

+131
-30
lines changed

‎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.12/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.1/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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*
3030
*/
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"
31+
#define STRFILEVER "1.12.101.1"
32+
#define COPYRIGHT "Copyright (C) 2021 Intel Corporation"
33+
#define FILEVER 1,12,101,1
34+
#define PRODUCTVER 1,12,101,1
35+
#define STRPRODUCTVER "1.12.101.1"
3636
#define COMPANYNAME "Intel Corporation"
3737
#define PRODUCTNAME "Intel® Software Guard Extensions"
3838

‎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.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/
32+
set ae_file_name=prebuilt_windows_dcap_1.12.1.zip
33+
set checksum_file=SHA256SUM_prebuilt_windows_dcap_1.12.1.cfg
34+
set server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.12.1/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.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
35+
ae_file_name=prebuilt_dcap_1.12.1.tar.gz
36+
checksum_file=SHA256SUM_prebuilt_dcap_1.12.1.cfg
37+
server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.12.1/linux
3838
server_ae_url=$server_url_path/$ae_file_name
3939
server_checksum_url=$server_url_path/$checksum_file
4040

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<description>DCAP Components</description>
1111
<copyright>Copyright (C) 2021 Intel Corporation</copyright>
1212
<dependencies>
13-
<dependency id="SgxHeaders" version="2.14.100.3" />
13+
<dependency id="SgxHeaders" version="2.14.101.1" />
1414
</dependencies>
1515
</metadata>
1616
<files>

‎QuoteGeneration/pccs/container/Dockerfile

Lines changed: 1 addition & 1 deletion
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.12
4+
ARG DCAP_VERSION=DCAP_1.12.1
55

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

‎QuoteGeneration/pccs/dao/fmspcTcbDao.js

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import Constants from '../constants/index.js';
3333
import PccsError from '../utils/PccsError.js';
3434
import PccsStatus from '../constants/pccs_status_code.js';
3535
import { FmspcTcbs, sequelize } from './models/index.js';
36+
import Sequelize from 'sequelize';
3637

3738
// Update or insert a record in JSON format
3839
export async function upsertFmspcTcb(tcbinfoJson) {
@@ -75,5 +76,22 @@ export async function getTcbInfo(type, fmspc) {
7576

7677
//Query all TCBInfos
7778
export async function getAllTcbs() {
78-
return await FmspcTcbs.findAll();
79+
return await FmspcTcbs.findAll({
80+
where: {
81+
type: {
82+
[Sequelize.Op.not]: null,
83+
},
84+
},
85+
});
86+
}
87+
88+
//Delete TCBInfos whose type is null
89+
export async function deleteInvalidTcbs() {
90+
return await FmspcTcbs.destroy({
91+
where: {
92+
type: {
93+
[Sequelize.Op.is]: null,
94+
},
95+
},
96+
});
7997
}

‎QuoteGeneration/pccs/migrations/02_db_version_2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ async function up(sequelize) {
4343
// this is done by 1.Create new table 2.Copy data 3.Drop old table 4.Rename new into old
4444
logger.debug('DB Migration -- update fmspc_tcbs');
4545
sql =
46-
'CREATE TABLE IF NOT EXISTS fmspc_tcbs_temp (fmspc VARCHAR(255) , type INTEGER, ' +
46+
'CREATE TABLE IF NOT EXISTS fmspc_tcbs_temp (fmspc VARCHAR(255) NOT NULL, type INTEGER NOT NULL, ' +
4747
' tcbinfo BLOB, root_cert_id INTEGER, signing_cert_id INTEGER, ' +
4848
' created_time DATETIME NOT NULL, updated_time DATETIME NOT NULL, PRIMARY KEY(fmspc, type));';
4949
await sequelize.query(sql);

‎QuoteGeneration/pccs/services/refreshService.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ async function refresh_one_tcb(fmspc) {
266266
// Then refresh cache DB
267267
await fmspcTcbDao.upsertFmspcTcb({
268268
fmspc: fmspc,
269+
type: Constants.PROD_TYPE_SGX,
269270
tcbinfo: pck_server_res.rawBody,
270271
});
271272
// update or insert certificate chain
@@ -282,6 +283,9 @@ async function refresh_one_tcb(fmspc) {
282283

283284
// Refresh all TCBs in the table
284285
async function refresh_all_tcbs() {
286+
// hotfix : delete type==null records
287+
await fmspcTcbDao.deleteInvalidTcbs();
288+
285289
const tcbs = await fmspcTcbDao.getAllTcbs();
286290
for (let tcb of tcbs) {
287291
// refresh each tcb

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ 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.15_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.15_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.15_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.15_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.15.101_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.15.101_reproducible)and signed by Intel.

0 commit comments

Comments
 (0)