Skip to content

Commit 0443ae2

Browse files
committed
Intel(R) SGX DCAP 1.17 Release
Applied CVE-2023-1255, CVE-2023-0465, and CVE-2023-0466 patches to SgxSSL/OpenSSL 1.1.1t. Upgraded to Intel(R) Integrated Performance Primitives (IPP) Cryptography library version 2021.7. Upgraded Intel SGX Quote Verification Enclave to integrate updated SgxSSL. Enhanced the attestation local cache functionality by giving users the option to provide their own cache file. Enabled QPL/QCNL log in DCAP samples. Fixed bugs. Signed-off-by: Li, Xun <xun.li@intel.com>
1 parent 4cb5c8b commit 0443ae2

File tree

172 files changed

+8855
-2250
lines changed

Some content is hidden

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

172 files changed

+8855
-2250
lines changed

QuoteGeneration/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ qve_wrapper:
7676

7777

7878
.PHONY: deb_sgx_dcap_ql_pkg
79-
deb_sgx_dcap_ql_pkg: $(CHECK_OPT) pce_logic qe3_logic qve_wrapper
79+
deb_sgx_dcap_ql_pkg: $(CHECK_OPT) pce_logic qe3_logic
8080
./installer/linux/deb/libsgx-dcap-ql/build.sh
8181

8282
.PHONY: deb_sgx_dcap_quote_verify_pkg

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.16/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.17/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: 10 additions & 10 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.16.100.2"
31+
#define STRFILEVER "1.17.100.4"
3232
#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"
33+
#define FILEVER 1,17,100,4
34+
#define PRODUCTVER 1,17,100,4
35+
#define STRPRODUCTVER "1.17.100.4"
3636
#define COMPANYNAME "Intel Corporation"
3737
#define PRODUCTNAME "Intel® Software Guard Extensions"
3838

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

4545
#define QE3_VERSION "1.16.100.1"
46-
#define QVE_VERSION "1.16.100.1"
46+
#define QVE_VERSION "1.17.100.1"
4747
#define IDE_VERSION "1.16.100.1"
4848
#define TDQE_VERSION "1.16.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.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/
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/
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.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/
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/
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/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ PCCS_CONF=pccs.service
3838
PCCS_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/))
3939

4040
ifeq ($(PCCS_CONF_PATH),)
41-
ifneq ($(shell awk -F/ '$$2 == "docker"' /proc/self/cgroup),)
41+
ifeq ($(BUILD_PLATFORM),docker)
4242
PCCS_CONF_PATH=/lib/systemd/system
4343
$(warning "You may need to start service manually after it's installed!")
4444
else
45-
(error "Unsupported platform - neither systemctl nor initctl is found!")
45+
$(error "Unsupported platform - neither systemctl nor initctl is found!")
4646
endif
4747
endif
4848

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ QGSD_CONF_DEL=$(if $(wildcard /run/systemd/system/.*),qgsd.conf,$(if $(wildcard
3939
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/))
4040

4141
ifeq ($(QGSD_CONF_NAME),)
42-
ifneq ($(shell awk -F/ '$$2 == "docker"' /proc/self/cgroup),)
42+
ifeq ($(BUILD_PLATFORM),docker)
4343
QGSD_CONF_NAME=qgsd.service
4444
QGSD_CONF_DEL=qgsd.conf
4545
QGSD_CONF_PATH=/lib/systemd/system
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#!/usr/bin/env bash
2+
# postrm script for libsgx-dcap-default-qpl
3+
#
4+
# see: dh_installdeb(1)
5+
6+
set -e
7+
8+
# summary of how this script can be called:
9+
# * <postrm> `remove'
10+
# * <postrm> `purge'
11+
# * <old-postrm> `upgrade' <new-version>
12+
# * <new-postrm> `failed-upgrade' <old-version>
13+
# * <new-postrm> `abort-install'
14+
# * <new-postrm> `abort-install' <old-version>
15+
# * <new-postrm> `abort-upgrade' <old-version>
16+
# * <disappearer's-postrm> `disappear' <overwriter>
17+
# <overwriter-version>
18+
# for details, see http://www.debian.org/doc/debian-policy/ or
19+
# the debian-policy package
20+
21+
22+
case "$1" in
23+
remove)
24+
;;
25+
26+
purge)
27+
# Remove program generated files
28+
# Define the directories to search
29+
user_home=$(getent passwd "$SUDO_USER" | cut -d: -f6)
30+
directories=("$AZDCAP_CACHE" "$XDG_CACHE_HOME" "$HOME" "$user_home" "$TMPDIR" "/tmp")
31+
32+
# Loop through the directories
33+
for dir in "${directories[@]}"; do
34+
# Check if the directory exists and is not empty
35+
if [ -n "$dir" ] && [ -d "$dir" ]; then
36+
# Check for the existence of the .dcap_qcnl subdirectory and delete it
37+
if [ -d "$dir/.dcap-qcnl" ]; then
38+
rm -rf "$dir/.dcap-qcnl"
39+
fi
40+
fi
41+
done
42+
;;
43+
44+
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
45+
;;
46+
47+
*)
48+
echo "postrm called with unknown argument \`$1'" >&2
49+
exit 1
50+
;;
51+
esac
52+
53+
# dh_installdeb will replace this with shell code automatically
54+
# generated by other debhelper scripts.
55+
56+
#DEBHELPER#
57+
58+
exit 0

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

0 commit comments

Comments
 (0)