admin/intel-linux-sgx
1
0
Fork 0
mirror of https://github.com/intel/linux-sgx synced 2026-06-08 14:49:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates for SGX 2.21 reproducible build.

Browse Source 
Signed-off-by: Zhang, Lili Z <lili.z.zhang@intel.com>
This commit is contained in:
Zhang, Lili Z
2023-08-22 11:22:28 +08:00
parent 20bed6e2bb
commit aef6ade7c4
26 changed files with 223 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+1 -1
View File
@@ -13,7 +13,7 @@
[submodule "ipp-crypto"]
path = external/ippcp_internal/ipp-crypto
url = https://github.com/intel/ipp-crypto.git
branch = ipp-crypto_2021_3
branch = ipp-crypto_2021_7
[submodule "external/protobuf/protobuf_code"]
path = external/protobuf/protobuf_code
url = https://github.com/protocolbuffers/protobuf.git
Makefile
+11 -1
View File
@@ -55,7 +55,7 @@ preparation:
cd external/openmp/openmp_code && git apply ../0001-Enable-OpenMP-in-SGX.patch >/dev/null 2>&1 || git apply ../0001-Enable-OpenMP-in-SGX.patch --check -R
cd external/protobuf/protobuf_code && git apply ../sgx_protobuf.patch >/dev/null 2>&1 || git apply ../sgx_protobuf.patch --check -R
./external/sgx-emm/create_symlink.sh
cd external/mbedtls/mbedtls_code && git apply ../sgx_mbedtls.patch >/dev/null 2>&1 || git apply ../sgx_mbedtls.patch --check -R
cd external/mbedtls/mbedtls_code && git apply ../sgx_mbedtls.patch >/dev/null 2>&1
@# download prebuilt binaries
./download_prebuilt.sh
./external/dcap_source/QuoteGeneration/download_prebuilt.sh
@@ -87,6 +87,16 @@ tdx:
$(MAKE) -C external/dcap_source/QuoteGeneration tdx_logic
$(MAKE) -C external/dcap_source/QuoteGeneration tdx_qgs
$(MAKE) -C external/dcap_source/QuoteGeneration tdx_attest
td_migration:
$(MAKE) -C sdk/ td_migration _TD_MIGRATION=1
$(MAKE) -C external/dcap_source/QuoteGeneration td_migration
td_migration_preparation:
# Only enable the download from git
git submodule update --init --recursive external/dcap_source external/sgx-emm/emm_src
./external/sgx-emm/create_symlink.sh
./external/dcap_source/QuoteVerification/prepare_sgxssl.sh nobuild
# Generate SE SDK Install package
sdk_install_pkg_no_mitigation: sdk_no_mitigation
SampleCode/SampleAttestedTLS/server_tdx/Makefile
+1 -1
View File
@@ -35,7 +35,7 @@ all: server
server:
$(CXX) -c -DTDX_ENV -DCLIENT_USE_QVL $(App_Cpp_Flags) server.cpp openssl_server.cpp ../common/verify_callback.cpp ../common/utility.cpp ../common/openssl_utility.cpp ../common/err_msg.cpp
$(CXX) -o tls_server server.o openssl_server.o verify_callback.o utility.o openssl_utility.o err_msg.o $(App_Link_Flags) -lssl -ltdx_tls -lsgx_dcap_quoteverify -l:libtdx_attest.so.1
$(CXX) -o tls_server server.o openssl_server.o verify_callback.o utility.o openssl_utility.o err_msg.o $(App_Link_Flags) -lssl -ltdx_tls -lsgx_dcap_quoteverify -ltdx_attest
clean:
rm -f tls_server *.o
buildenv.mk
+4
View File
@@ -120,6 +120,10 @@ ifeq ($(BUILD_REF_LE), 1)
COMMON_FLAGS += -DREF_LE
endif
ifdef _TD_MIGRATION
COMMON_FLAGS += -D_TD_MIGRATION
endif
COMMON_FLAGS += -ffunction-sections -fdata-sections
# turn on compiler warnings as much as possible
common/inc/internal/se_version.h
+8 -8
View File
@@ -31,21 +31,21 @@
#ifndef _SE_VERSION_H_
#define _SE_VERSION_H_
#define STRFILEVER "2.20.100.1"
#define STRFILEVER "2.21.100.1"
#define SGX_MAJOR_VERSION 2
#define SGX_MINOR_VERSION 20
#define SGX_MINOR_VERSION 21
#define SGX_REVISION_VERSION 100
#define MAKE_VERSION_UINT(major,minor,rev) (((uint64_t)major)<<32 | ((uint64_t)minor) << 16 | rev)
#define VERSION_UINT MAKE_VERSION_UINT(SGX_MAJOR_VERSION, SGX_MINOR_VERSION, SGX_REVISION_VERSION)
#define COPYRIGHT "Copyright (C) 2023 Intel Corporation"
#define UAE_SERVICE_VERSION "2.3.219.1"
#define URTS_VERSION "2.0.103.1"
#define ENCLAVE_COMMON_VERSION "1.2.103.1"
#define LAUNCH_VERSION "1.0.121.1"
#define EPID_VERSION "1.0.121.1"
#define QUOTE_EX_VERSION "1.1.121.1"
#define UAE_SERVICE_VERSION "2.3.220.1"
#define URTS_VERSION "2.0.104.1"
#define ENCLAVE_COMMON_VERSION "1.2.104.1"
#define LAUNCH_VERSION "1.0.122.1"
#define EPID_VERSION "1.0.122.1"
#define QUOTE_EX_VERSION "1.1.122.1"
#define PCE_VERSION "1.19.100.1"
#define LE_VERSION "1.19.100.1"
common/inc/sgx_report2.h
+3
View File
@@ -36,6 +36,8 @@
#ifndef _SGX_REPORT2_H_
#define _SGX_REPORT2_H_
#include <stdint.h>
#define TEE_HASH_384_SIZE 48 /* SHA384 */
#define TEE_MAC_SIZE 32 /* Message SHA 256 HASH Code - 32 bytes */
@@ -67,6 +69,7 @@ typedef struct _tee_attributes_t
#define TEE_REPORT2_TYPE 0x81 /* TEE Report Type2 */
#define TEE_REPORT2_SUBTYPE 0x0 /* SUBTYPE for Report Type2 is 0 */
#define TEE_REPORT2_VERSION 0x0 /* VERSION for Report Type2 is 0 */
#define TEE_REPORT2_VERSION_SERVICETD 0x1 /* VERSION for Report Type2 which mr_servicetd is used */
typedef struct _tee_report_type_t {
uint8_t type; /* Trusted Execution Environment(TEE) type:
common/src/sgx_read_rand.cpp
+10
View File
@@ -33,11 +33,17 @@
/* Please add external/rdrand into INCLUDE path and correpondent library to project */
#include <stdint.h>
#ifndef _TD_MIGRATION
#include <memory.h>
#else
#include <string.h>
#endif
#include <stdlib.h>
#include "sgx.h"
#include "sgx_defs.h"
#ifndef _TD_MIGRATION
#include "se_wrapper.h"
#endif
#include "rdrand.h"
#include "cpuid.h"
#include <stdio.h>
@@ -84,10 +90,14 @@ extern "C" sgx_status_t SGXAPI sgx_read_rand(uint8_t *buf, size_t size)
g_is_rdrand_supported = rdrand_cpuid();
}
if(!g_is_rdrand_supported){
#ifndef _TD_MIGRATION
uint32_t i;
for(i=0;i<(uint32_t)size;++i){
buf[i]=(uint8_t)rand();
}
#else
return SGX_ERROR_UNEXPECTED;
#endif
}else{
int rd_ret =rdrand_get_bytes((uint32_t)size, buf);
if(rd_ret != RDRAND_SUCCESS){
download_prebuilt.sh
+4 -4
View File
@@ -33,11 +33,11 @@
top_dir=`dirname $0`
out_dir=$top_dir
optlib_name=optimized_libs_2.20.tar.gz
ae_file_name=prebuilt_ae_2.20.tar.gz
optlib_name=optimized_libs_2.21.tar.gz
ae_file_name=prebuilt_ae_2.21.tar.gz
binutils_file_name=as.ld.objdump.r4.tar.gz
checksum_file=SHA256SUM_prebuilt_2.20.cfg
server_url_path=https://download.01.org/intel-sgx/sgx-linux/2.20
checksum_file=SHA256SUM_prebuilt_2.21.cfg
server_url_path=https://download.01.org/intel-sgx/sgx-linux/2.21
server_optlib_url=$server_url_path/$optlib_name
server_ae_url=$server_url_path/$ae_file_name
server_binutils_url=$server_url_path/$binutils_file_name
external/dcap_source
Vendored
+1 -1
Submodule external/dcap_source updated: 57f03c3114...62d4274af0
external/protobuf/sgx_protobuf.patch
Vendored
+78 -6
View File
@@ -1,12 +1,13 @@
From b309912dc33756a51d49af062ba883790d206f14 Mon Sep 17 00:00:00 2001
From 693787f29e638e6f65dfdd5ee3dd9c2a45b7d3df Mon Sep 17 00:00:00 2001
From: yanxue <yan.xue@intel.com>
Date: Fri, 6 May 2022 16:04:12 +0800
Date: Tue, 1 Aug 2023 07:12:57 +0000
Subject: [PATCH] Enable Protobuf in SGX
---
cmake/CMakeLists.txt | 31 +++-
cmake/libsgx_protobuf.cmake | 140 ++++++++++++++++++
configure.ac | 2 +-
.../google/protobuf/MessageReflection.java | 26 +++-
.../protobuf/io/zero_copy_stream_impl.cc | 6 +
.../protobuf/io/zero_copy_stream_impl.h | 4 +-
src/google/protobuf/map.h | 12 ++
@@ -28,7 +29,7 @@ Subject: [PATCH] Enable Protobuf in SGX
.../protobuf/util/delimited_message_util.cc | 2 +
.../protobuf/util/delimited_message_util.h | 7 +-
src/google/protobuf/util/time_util.h | 4 +
24 files changed, 292 insertions(+), 14 deletions(-)
25 files changed, 317 insertions(+), 15 deletions(-)
create mode 100644 cmake/libsgx_protobuf.cmake
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -234,7 +235,7 @@ index 000000000..2d5b33da5
+ DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
+add_library(protobuf::libprotobuf ALIAS libprotobuf)
diff --git a/configure.ac b/configure.ac
index 5de1ce20a..712fa41d5 100644
index 7c5c2c799..31c63629f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,7 +106,7 @@ ACX_CHECK_SUNCC
@@ -246,6 +247,77 @@ index 5de1ce20a..712fa41d5 100644
# Check whether the linker supports version scripts
AC_MSG_CHECKING([whether the linker supports version scripts])
diff --git a/java/core/src/main/java/com/google/protobuf/MessageReflection.java b/java/core/src/main/java/com/google/protobuf/MessageReflection.java
index b7f5d52d4..f032d4926 100644
--- a/java/core/src/main/java/com/google/protobuf/MessageReflection.java
+++ b/java/core/src/main/java/com/google/protobuf/MessageReflection.java
@@ -349,6 +349,7 @@ class MessageReflection {
static class BuilderAdapter implements MergeTarget {
private final Message.Builder builder;
+ private boolean hasNestedBuilders = true;
@Override
public Descriptors.Descriptor getDescriptorForType() {
@@ -363,6 +364,17 @@ class MessageReflection {
public Object getField(Descriptors.FieldDescriptor field) {
return builder.getField(field);
}
+
+ private Message.Builder getFieldBuilder(Descriptors.FieldDescriptor field) {
+ if (hasNestedBuilders) {
+ try {
+ return builder.getFieldBuilder(field);
+ } catch (UnsupportedOperationException e) {
+ hasNestedBuilders = false;
+ }
+ }
+ return null;
+ }
@Override
public boolean hasField(Descriptors.FieldDescriptor field) {
@@ -371,6 +383,12 @@ class MessageReflection {
@Override
public MergeTarget setField(Descriptors.FieldDescriptor field, Object value) {
+ if (!field.isRepeated() && value instanceof MessageLite.Builder) {
+ if (value != getFieldBuilder(field)) {
+ builder.setField(field, ((MessageLite.Builder) value).buildPartial());
+ }
+ return this;
+ }
builder.setField(field, value);
return this;
}
@@ -384,12 +402,18 @@ class MessageReflection {
@Override
public MergeTarget setRepeatedField(
Descriptors.FieldDescriptor field, int index, Object value) {
+ if (value instanceof MessageLite.Builder) {
+ value = ((MessageLite.Builder) value).buildPartial();
+ }
builder.setRepeatedField(field, index, value);
return this;
}
@Override
public MergeTarget addRepeatedField(Descriptors.FieldDescriptor field, Object value) {
+ if (value instanceof MessageLite.Builder) {
+ value = ((MessageLite.Builder) value).buildPartial();
+ }
builder.addRepeatedField(field, value);
return this;
}
@@ -543,7 +567,7 @@ class MessageReflection {
@Override
public Object finish() {
- return builder.buildPartial();
+ return builder;
}
}
diff --git a/src/google/protobuf/io/zero_copy_stream_impl.cc b/src/google/protobuf/io/zero_copy_stream_impl.cc
index c66bc862a..1fee728cd 100644
--- a/src/google/protobuf/io/zero_copy_stream_impl.cc
@@ -408,7 +480,7 @@ index 1c22f894e..69006e686 100644
// Like SerializeToString(), but appends to the data to the string's
// existing contents. All required fields must be set.
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index 31ab3b159..cadbf1645 100644
index 1e360ccce..0765998b8 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -608,7 +608,7 @@
@@ -848,5 +920,5 @@ index 95cc64520..6d7c44775 100644
#include <google/protobuf/duration.pb.h>
--
2.17.1
2.34.1
external/sgxssl/prepare_sgxssl.sh
Vendored
+4 -9
View File
@@ -32,16 +32,16 @@
top_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
openssl_out_dir=$top_dir/openssl_source
openssl_ver=1.1.1t
openssl_ver=1.1.1u
openssl_ver_name=openssl-$openssl_ver
sgxssl_github_archive=https://github.com/intel/intel-sgx-ssl/archive
sgxssl_file_name=lin_2.19_1.1.1t
sgxssl_file_name=lin_2.21_1.1.1u
build_script=$top_dir/Linux/build_openssl.sh
server_url_path=https://www.openssl.org/source
full_openssl_url=$server_url_path/old/1.1.1/$openssl_ver_name.tar.gz
sgxssl_chksum=bff5a9059911846e27447acb402c4690346abf46da8e1c26b66d406e8abb1588
openssl_chksum=8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b
sgxssl_chksum=b83c6f98041eb77df209cef91b77b68a8cbd861e5617fe1bf087398042e5ace6
openssl_chksum=e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6
rm -f check_sum_sgxssl.txt check_sum_openssl.txt
if [ ! -f $build_script ]; then
wget $sgxssl_github_archive/$sgxssl_file_name.zip -P $top_dir || exit 1
@@ -70,11 +70,6 @@ if [ ! -f $openssl_out_dir/$openssl_ver_name.tar.gz ]; then
fi
pushd $top_dir/Linux/
patched=$(grep -c x509 build_openssl.sh)
if [ '0' -eq $patched ]; then
sed -i '140a cp ../../../dcap_source/prebuilt/openssl/OpenSSL_1.1.1u_files/pcy_*.* crypto/x509v3/.' build_openssl.sh
sed -i '140a cp ../../../dcap_source/prebuilt/openssl/OpenSSL_1.1.1u_files/x509_vfy.c crypto/x509/.' build_openssl.sh
fi
if [ "$MITIGATION" != "" ]; then
make clean all LINUX_SGX_BUILD=1 DEBUG=$DEBUG
else
linux/installer/common/sdk/BOMs/sdk_base.txt
+1
View File
@@ -93,6 +93,7 @@ DeliveryName InstallName FileCheckSum FileFeature FileOwner
<deliverydir>/external/dcap_source/QuoteGeneration/pce_wrapper/inc/sgx_pce.h <installdir>/package/include/./sgx_pce.h 0 main STP
<deliverydir>/external/dcap_source/QuoteGeneration/quote_wrapper/common/inc/sgx_quote_3.h <installdir>/package/include/./sgx_quote_3.h 0 main STP
<deliverydir>/external/dcap_source/QuoteGeneration/quote_wrapper/common/inc/sgx_quote_4.h <installdir>/package/include/./sgx_quote_4.h 0 main STP
<deliverydir>/external/dcap_source/QuoteGeneration/quote_wrapper/common/inc/sgx_quote_5.h <installdir>/package/include/./sgx_quote_5.h 0 main STP
<deliverydir>/external/dcap_source/QuoteGeneration/quote_wrapper/common/inc/sgx_ql_quote.h <installdir>/package/include/./sgx_ql_quote.h 0 main STP
<deliverydir>/external/dcap_source/QuoteVerification/QvE/Include/sgx_qve_header.h <installdir>/package/include/./sgx_qve_header.h 0 main STP
<deliverydir>/external/dcap_source/QuoteVerification/dcap_tvl/sgx_dcap_tvl.h <installdir>/package/include/./sgx_dcap_tvl.h 0 main STP
linux/installer/deb/sgx-aesm-service/sgx-aesm-service-1.0/debian/control
+2 -2
View File
@@ -37,12 +37,12 @@ Description: Unified Quote Plugin for Intel(R) Software Guard Extensions AESM Se
Package: libsgx-aesm-ecdsa-plugin
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, sgx-aesm-service(>= @dep_version@), libsgx-qe3-logic(>= 1.17), libsgx-aesm-pce-plugin(>= @dep_version@)
Depends: ${shlibs:Depends}, ${misc:Depends}, sgx-aesm-service(>= @dep_version@), libsgx-qe3-logic(>= 1.18), libsgx-aesm-pce-plugin(>= @dep_version@)
Description: ECDSA Quote Plugin for Intel(R) Software Guard Extensions AESM Service
Package: libsgx-aesm-pce-plugin
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, sgx-aesm-service(>= @dep_version@), libsgx-pce-logic(>= 1.17), libsgx-ae-pce(>= @dep_version@)
Depends: ${shlibs:Depends}, ${misc:Depends}, sgx-aesm-service(>= @dep_version@), libsgx-pce-logic(>= 1.18), libsgx-ae-pce(>= @dep_version@)
Description: PCE Plugin for Intel(R) Software Guard Extensions AESM Service
Package: libsgx-ae-pce
linux/installer/rpm/psw-tdx/sanitize.sh
+2
View File
@@ -46,7 +46,9 @@ make -C ${root_dir} preparation
# Prepare ipp-crypto source
pushd ${root_dir}/external/ippcp_internal/
cd ipp-crypto && git apply ../0001-IPP-crypto-for-SGX_psw_dcap.patch >/dev/null 2>&1 || git apply ../0001-IPP-crypto-for-SGX_psw_dcap.patch --check -R
popd
python ${common_dir}/gen_source/copy_source.py \
linux/installer/rpm/sgx-aesm-service/libsgx-aesm-ecdsa-plugin.spec
+1 -1
View File
@@ -38,7 +38,7 @@ Version: @version@
Release: 1%{?dist}
Summary: ECDSA Quote Plugin for Intel(R) Software Guard Extensions AESM Service
Group: Development/System
Requires: sgx-aesm-service >= %{version}-%{release} libsgx-qe3-logic >= 1.17 libsgx-aesm-pce-plugin >= %{version}-%{release}
Requires: sgx-aesm-service >= %{version}-%{release} libsgx-qe3-logic >= 1.18 libsgx-aesm-pce-plugin >= %{version}-%{release}
License: BSD License
URL: https://github.com/intel/linux-sgx
linux/installer/rpm/sgx-aesm-service/libsgx-aesm-pce-plugin.spec
+1 -1
View File
@@ -38,7 +38,7 @@ Version: @version@
Release: 1%{?dist}
Summary: PCE Plugin for Intel(R) Software Guard Extensions AESM Service
Group: Development/System
Requires: sgx-aesm-service >= %{version}-%{release} libsgx-pce-logic >= 1.17
Requires: sgx-aesm-service >= %{version}-%{release} libsgx-pce-logic >= 1.18
License: BSD License
URL: https://github.com/intel/linux-sgx
linux/reproducibility/build_and_launch_docker.sh
+3 -3
View File
@@ -75,8 +75,8 @@ mount_dir="/linux-sgx"
sdk_installer=""
sgx_src=""
default_sdk_installer=sgx_linux_x64_sdk_reproducible_2.20.100.1.bin
default_sdk_installer_url=https://download.01.org/intel-sgx/sgx-linux/2.20/distro/nix_reproducibility/$default_sdk_installer
default_sdk_installer=sgx_linux_x64_sdk_reproducible_2.21.100.1.bin
default_sdk_installer_url=https://download.01.org/intel-sgx/sgx-linux/2.21/distro/nix_reproducibility/$default_sdk_installer
usage()
@@ -177,7 +177,7 @@ prepare_sgx_src()
if [ "$sgx_src" != "" ]; then
mkdir -p "$sgx_repo" && cp -a "$sgx_src/." "$sgx_repo"
else
git clone -b sgx_2.20_reproducible https://github.com/intel/linux-sgx.git $sgx_repo
git clone -b sgx_2.21_reproducible https://github.com/intel/linux-sgx.git $sgx_repo
fi
cd "$sgx_repo" && make preparation
psw/ae/data/prebuilt/README.md
+4 -4
View File
@@ -1,11 +1,11 @@
# LE source code
The LE is part of Intel(R) Software Guard Extensions for Linux\* OS which is published in [linux-sgx](https://github.com/intel/linux-sgx/) Github repository. The libsgx_le.signed.so in prebuilt package is built by [le](https://github.com/intel/linux-sgx/tree/master/psw/ae/le) with branch [sgx_2.17_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.17_reproducible) and signed by Intel.
The LE is part of Intel(R) Software Guard Extensions for Linux\* OS which is published in [linux-sgx](https://github.com/intel/linux-sgx/) Github repository. The libsgx_le.signed.so in prebuilt package is built by [le](https://github.com/intel/linux-sgx/tree/master/psw/ae/le) with branch [sgx_2.19_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.19_reproducible) and signed by Intel.
# PVE source code
The PVE is part of Intel(R) Software Guard Extensions for Linux\* OS which is published in [linux-sgx](https://github.com/intel/linux-sgx/) Github repository. The libsgx_pve.signed.so in prebuilt package is built by [pve](https://github.com/intel/linux-sgx/tree/master/psw/ae/pve) with branch [sgx_2.17_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.17_reproducible) and signed by Intel.
The PVE is part of Intel(R) Software Guard Extensions for Linux\* OS which is published in [linux-sgx](https://github.com/intel/linux-sgx/) Github repository. The libsgx_pve.signed.so in prebuilt package is built by [pve](https://github.com/intel/linux-sgx/tree/master/psw/ae/pve) with branch [sgx_2.19_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.19_reproducible) and signed by Intel.
# PCE source code
The PCE is part of Intel(R) Software Guard Extensions for Linux\* OS which is published in [linux-sgx](https://github.com/intel/linux-sgx/) Github repository. The libsgx_pce.signed.so in prebuilt package is built by [pce](https://github.com/intel/linux-sgx/tree/master/psw/ae/pce) with branch [sgx_2.17_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.17_reproducible) and signed by Intel.
The PCE is part of Intel(R) Software Guard Extensions for Linux\* OS which is published in [linux-sgx](https://github.com/intel/linux-sgx/) Github repository. The libsgx_pce.signed.so in prebuilt package is built by [pce](https://github.com/intel/linux-sgx/tree/master/psw/ae/pce) with branch [sgx_2.19_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.19_reproducible) and signed by Intel.
# QE source code
The QE is part of Intel(R) Software Guard Extensions for Linux\* OS which is published in [linux-sgx](https://github.com/intel/linux-sgx/) Github repository. The libsgx_qe.signed.so in prebuilt package is built by [qe](https://github.com/intel/linux-sgx/tree/master/psw/ae/qe) with branch [sgx_2.17_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.17_reproducible) and signed by Intel.
The QE is part of Intel(R) Software Guard Extensions for Linux\* OS which is published in [linux-sgx](https://github.com/intel/linux-sgx/) Github repository. The libsgx_qe.signed.so in prebuilt package is built by [qe](https://github.com/intel/linux-sgx/tree/master/psw/ae/qe) with branch [sgx_2.19_reproducible](https://github.com/intel/linux-sgx/tree/sgx_2.19_reproducible) and signed by Intel.
sdk/Makefile.source
+31 -1
View File
@@ -76,6 +76,7 @@ components: tstdc tcxx tservice trts tcrypto tkey_exchange ukey_exchange tprotec
.PHONY: tstdc
tstdc: $(LIBTLIBC)
ifndef _TD_MIGRATION
$(LIBTLIBC): tlibthread compiler-rt tsafecrt tsetjmp tmm_rsrv
$(MAKE) -C tlibc/ -j$(shell nproc) 2> /dev/null
@$(MKDIR) $(BUILD_DIR)/.compiler-rt $(BUILD_DIR)/.tlibthread $(BUILD_DIR)/.tsafecrt $(BUILD_DIR)/.tsetjmp $(BUILD_DIR)/.tmm_rsrv
@@ -93,6 +94,20 @@ $(LIBTLIBC): tlibthread compiler-rt tsafecrt tsetjmp tmm_rsrv
@$(RM) -rf $(BUILD_DIR)/.compiler-rt
@$(RM) -rf $(BUILD_DIR)/.tlibthread $(BUILD_DIR)/.tsafecrt
@$(RM) -rf $(BUILD_DIR)/.tsetjmp $(BUILD_DIR)/.tmm_rsrv
else
$(LIBTLIBC): tlibthread tsafecrt tsetjmp tmm_rsrv
$(MAKE) -C tlibc/ _TD_MIGRATION=1 -j$(shell nproc) 2> /dev/null
@$(MKDIR) $(BUILD_DIR)/.tlibthread $(BUILD_DIR)/.tsafecrt $(BUILD_DIR)/.tsetjmp $(BUILD_DIR)/.tmm_rsrv
@$(RM) -f $(BUILD_DIR)/.tlibthread/* && cd $(BUILD_DIR)/.tlibthread && $(AR) x $(LINUX_SDK_DIR)/tlibthread/libtlibthread.a
@$(RM) -f $(BUILD_DIR)/.tsafecrt/* && cd $(BUILD_DIR)/.tsafecrt && $(AR) x $(LINUX_SDK_DIR)/tsafecrt/libsgx_tsafecrt.a
@$(RM) -f $(BUILD_DIR)/.tsetjmp/* && cd $(BUILD_DIR)/.tsetjmp && $(AR) x $(LINUX_SDK_DIR)/tsetjmp/libsgx_tsetjmp.a
@$(RM) -f $(BUILD_DIR)/.tmm_rsrv/* && cd $(BUILD_DIR)/.tmm_rsrv && $(AR) x $(LINUX_SDK_DIR)/tmm_rsrv/libsgx_tmm_rsrv.a
$(CP) $(LINUX_SDK_DIR)/tlibc/libtlibc.a $@
$(AR) qD $@ $(BUILD_DIR)/.tlibthread/*.o
$(AR) qD $@ $(BUILD_DIR)/.tsafecrt/*.o
$(AR) qD $@ $(BUILD_DIR)/.tsetjmp/*.o
$(AR) qD $@ $(BUILD_DIR)/.tmm_rsrv/*.o
endif
.PHONY: tlibthread
tlibthread:
@@ -135,7 +150,12 @@ $(LIBTCXX): cpprt tlibcxx
@cd $(BUILD_DIR)/.tlibcxx && $(AR) x $(LINUX_SDK_DIR)/tlibcxx/libcxx.a
$(CP) $(LINUX_SDK_DIR)/cpprt/libcpprt.a $@
$(AR) qD $@ $(BUILD_DIR)/.tlibcxx/*.o
@$(RM) -rf $(BUILD_DIR)/.tlibcxx
ifdef _TD_MIGRATION
@$(MKDIR) $(BUILD_DIR)/.cpprt
@$(RM) -f $(BUILD_DIR)/.cpprt/* && cd $(BUILD_DIR)/.cpprt && $(AR) x $(LINUX_SDK_DIR)/cpprt/libcpprt.a
else
@$(RM) -rf $(BUILD_DIR)/.tlibcxx
endif
.PHONY: cpprt
cpprt:
@@ -287,6 +307,9 @@ sgx_encrypt: tservice
$(BUILD_DIR):
$(MKDIR) $@
.PHONY: td_migration
td_migration: tstdc tcxx edger8r
.PHONY: clean
clean:
$(MAKE) -C tlibc/ clean
@@ -324,3 +347,10 @@ clean:
$(MAKE) -C $(LINUX_EXTERNAL_DIR)/mbedtls clean
@$(RM) $(LIBTLIBC) $(LIBTCXX) $(LIBTSE)
@$(RM) $(BUILD_DIR)/libc++_Changes_SGX.txt
@$(RM) -rf $(BUILD_DIR)/.compiler-rt
@$(RM) -rf $(BUILD_DIR)/.tlibthread
@$(RM) -rf $(BUILD_DIR)/.tsafecrt
@$(RM) -rf $(BUILD_DIR)/.tsetjmp
@$(RM) -rf $(BUILD_DIR)/.tmm_rsrv
@$(RM) -rf $(BUILD_DIR)/.tlibcxx
@$(RM) -rf $(BUILD_DIR)/.cpprt
sdk/selib/sgx_verify_report2.cpp
+2 -1
View File
@@ -74,7 +74,8 @@ sgx_status_t sgx_verify_report2(const sgx_report2_mac_struct_t *report_mac_struc
}
if (report_mac_struct->report_type.subtype != TEE_REPORT2_SUBTYPE
|| report_mac_struct->report_type.version != TEE_REPORT2_VERSION)
|| (report_mac_struct->report_type.version != TEE_REPORT2_VERSION
&& report_mac_struct->report_type.version != TEE_REPORT2_VERSION_SERVICETD))
{
err = SGX_ERROR_INVALID_PARAMETER;
goto CLEANUP;
sdk/tlibc/Makefile
+1 -1
View File
@@ -108,4 +108,4 @@ $(BUILD_DIR):
.PHONY: clean
clean:
@$(RM) $(LIBC_NAME) $(LIBC_OBJS) math/opt/*.o
@$(RM) $(LIBC_NAME) $(LIBC_OBJS) math/opt/*.o
sdk/tlibc/gen/sbrk.c
+7
View File
@@ -41,10 +41,17 @@
SE_DECLSPEC_EXPORT size_t g_peak_heap_used = 0;
/* Please be aware of: sbrk is not thread safe by default. */
#ifndef _TD_MIGRATION
static void *heap_base __attribute__((section(RELRO_SECTION_NAME))) = NULL;
static size_t heap_size __attribute__((section(RELRO_SECTION_NAME))) = 0;
static int is_edmm_supported __attribute__((section(RELRO_SECTION_NAME))) = 0;
static size_t heap_min_size __attribute__((section(RELRO_SECTION_NAME))) = 0;
#else
void *heap_base = NULL;
size_t heap_size = 0;
int is_edmm_supported = 0;
size_t heap_min_size = 0;
#endif
int heap_init(void *_heap_base, size_t _heap_size, size_t _heap_min_size, int _is_edmm_supported)
{
sdk/trts/linux/trts_mitigation.S
+36 -49
View File
@@ -83,11 +83,11 @@ aex_notify_c3_cache:
* 1. The low-order bit of `stack_tickle_pages` is 1 if a second stack
* page should be tickled (specifically, the stack page immediately
* below the page specified in the upper bits)
* 2. The low-order bit of `code_tickle_page` is 1 if the cycle delay
* should be added to the mitigation
* 3. The low-order bit of `data_tickle_page` is 1 if `data_tickle_page`
* 2. Bit 0 of `code_tickle_page` is 1 if `data_tickle_address`
* is writable, and therefore should be tested for write permissions
* by the mitigation
* 3. Bit 4 of `code_tickle_page` is 1 if the cycle delay
* should be added to the mitigation
*
* Stack:
* bottom of stack -> ---------------------------
@@ -286,7 +286,13 @@ DECLARE_LOCAL_FUNC constant_time_apply_sgxstep_mitigation_and_continue_execution
mov RSVD_DATA_TICKLE_OFFSET(%rsp), %rdx
mov RSVD_C3_ADDRESS_OFFSET(%rsp), %rdi
# Restore flags
# Set up the stack tickles
shrb $1, %bpl # Bit 0 in %rbp indicates whether a second stack page can be tickled
mov %rbp, %rbx
jnc .restore_flags
sub $0x1000, %rbx
.restore_flags:
lea RSVD_FLAGS_OFFSET(%rsp), %rax
xchg %rax, %rsp
popf
@@ -308,63 +314,38 @@ DECLARE_LOCAL_FUNC constant_time_apply_sgxstep_mitigation_and_continue_execution
.global __ct_mitigation_begin
__ct_mitigation_begin:
# Step 1: Inject random cycle noise
movzx %sil, %rcx # The lowest byte in %xsi indicates whether cycles should be added
mov $0, %sil
lfence
jrcxz .ct_set_up_tickles
CYCLE_DELAY 20, %rax
.ct_set_up_tickles:
lfence
movzx %bpl, %rcx # The lowest byte in %rbp indicates whether a second stack page can be tickled
jrcxz .ct_set_up_tickles_with_one_stack_page
mov $0x00, %bpl
lea -0x1000(%rbp), %rbx
jmp .ct_warm_caches_and_tlbs
.ct_set_up_tickles_with_one_stack_page:
lea 0x08(%rbp), %rbx
.ct_check_write:
movl $63, %ecx
shlx %rcx, %rsi, %rcx # Bit 0 in %rsi indicates whether data_tickle_address can be written
jrcxz .ct_clear_low_bits_of_rdx
lea -1(%rsi), %rsi # Clear bit 0 in %rsi
movb (%rdx), %al
movb %al, (%rdx) # Will fault if the data page is not writable
.ct_clear_low_bits_of_rdx:
movl $12, %ecx
shrx %rcx, %rdx, %rdx
shlx %rcx, %rdx, %rdx
.ct_check_execute:
call *%rdi
# Load all working set cache lines and warm the TLB entries
mov $0x1000, %ecx
.align 0x10
.ct_warm_caches_and_tlbs:
movzx %dl, %rcx # The lowest byte in %rdx indicates whether data_tickle_page can be written to
mov $0x10, %dl # avoid sequencing uops, in case rbp and rdx alias
jrcxz .ct_warm_caches_and_tlbs_data_read_pre
.ct_warm_caches_and_tlbs_data_write_pre:
mov $0x1000, %ecx
.align 0x10
.ct_warm_caches_and_tlbs_data_write:
lea -0x40(%ecx), %ecx
call *%rdi
mov (%rsi, %rcx), %eax
mov (%rbp, %rcx), %eax
mov %eax, (%rbp, %rcx)
mov (%rbx, %rcx), %eax
mov %eax, (%rbx, %rcx)
mov (%rdx, %rcx), %eax
mov %eax, (%rdx, %rcx)
jrcxz .ct_restore_state
jmp .ct_warm_caches_and_tlbs_data_write # loops 64 times
// This block is identical to the previous one, except that it doesn't write
// to data_tickle_page.
.ct_warm_caches_and_tlbs_data_read_pre:
mov $0x1000, %ecx
.align 0x10
.ct_warm_caches_and_tlbs_data_read:
lea -0x40(%ecx), %ecx
call *%rdi
mov (%rsi, %rcx), %eax
mov (%rbp, %rcx), %eax
mov %eax, (%rbp, %rcx)
mov (%rbx, %rcx), %eax
mov %eax, (%rbx, %rcx)
mov (%rdx, %rcx), %eax
jrcxz .ct_restore_state
jmp .ct_warm_caches_and_tlbs_data_read # loops 64 times
jmp .ct_warm_caches_and_tlbs # loops 64 times
.ct_restore_state:
movzx %sil, %ecx # Bit 4 of %sil indicates whether cycles should be added
mov RSVD_REDZONE_WORD_OFFSET(%rsp), %rdi
mov %rdi, -SE_WORDSIZE(%rsp) # restore the first q/dword of the red zone
mov RSVD_RDI_OFFSET(%rsp), %rdi
@@ -372,8 +353,14 @@ __ct_mitigation_begin:
mov RSVD_RBP_OFFSET(%rsp), %rbp
mov RSVD_RBX_OFFSET(%rsp), %rbx
mov RSVD_RDX_OFFSET(%rsp), %rdx
mov RSVD_RCX_OFFSET(%rsp), %rcx
mov RSVD_RAX_OFFSET(%rsp), %rax
# Inject random cycle noise
jrcxz .ct_restore_rcx
CYCLE_DELAY 20, %rsp
.ct_restore_rcx:
mov RSVD_RCX_OFFSET(%rsp), %rcx
__ct_mitigation_end:
jmp *RSVD_RIP_OFFSET(%rsp)
sdk/trts/trts_veh.cpp
+4 -4
View File
@@ -260,18 +260,18 @@ static void apply_constant_time_sgxstep_mitigation_and_continue_execution(sgx_ex
}
thread_data->aex_notify_entropy_remaining = 31;
}
code_tickle_page |= thread_data->aex_notify_entropy_cache & 1;
code_tickle_page |= (thread_data->aex_notify_entropy_cache & 1) << 4;
thread_data->aex_notify_entropy_cache >>= 1;
// There are three additional "implicit" parameters to this function:
// 1. The low-order bit of `stack_tickle_pages` is 1 if a second stack
// page should be tickled (specifically, the stack page immediately
// below the page specified in the upper bits)
// 2. The low-order bit of `code_tickle_page` is 1 if the cycle delay
// should be added to the mitigation
// 3. The low-order bit of `data_tickle_page` is 1 if `data_tickle_page`
// 2. Bit 0 of `code_tickle_page` is 1 if `data_tickle_address`
// is writable, and therefore should be tested for write permissions
// by the mitigation
// 3. Bit 4 of `code_tickle_page` is 1 if the cycle delay
// should be added to the mitigation
constant_time_apply_sgxstep_mitigation_and_continue_execution(
info, thread_data->first_ssa_gpr + offsetof(ssa_gpr_t, aex_notify),
stack_tickle_pages, code_tickle_page,
sdk/ttls/Makefile
+2 -1
View File
@@ -57,6 +57,7 @@ INCLUDE += -I$(COMMON_DIR)/inc/tlibc \
-I$(SGX_QV_PATH)/dcap_tvl \
-include./tsgxsslio.h \
-I$(PREBUILT_OPENSSL_PATH)/inc
INCLUDE_TDX := $(filter-out -I$(PREBUILT_OPENSSL_PATH)/inc,$(INCLUDE))
CXXFLAGS_TDX := $(CXXFLAGS) $(COMMON_FLAGS) $(COMMON_LDFLAGS) -fPIC -Werror -Wno-unused-parameter -g
CXXFLAGS += $(COMMON_FLAGS) $(ENCLAVE_CXXFLAGS)
@@ -93,7 +94,7 @@ $(OBJ): $(TLSNAME)_t.h
$(OBJ): %.o :%.cpp
$(CXX) $(CXXFLAGS) $(INCLUDE) -c $< -o $@
$(OBJ_TDX): tdx_%.o :%.cpp
$(CXX) $(CXXFLAGS_TDX) $(INCLUDE) -DTDX_ENV -c $< -o $@
$(CXX) $(CXXFLAGS_TDX) $(INCLUDE_TDX) -DTDX_ENV -c $< -o $@
.PHONY: clean
clean:
sdk/ttls/ttls.cpp
+1 -12
View File
@@ -81,7 +81,6 @@ extern "C" quote3_error_t tee_get_certificate_with_evidence(
#else
tdx_attest_error_t tdx_ret = TDX_ATTEST_ERROR_UNEXPECTED;
tdx_uuid_t selected_att_key_id = { 0 };
SHA256_CTX sha_handle;
tdx_report_data_t report_data = { 0 };
#endif
sgx_status_t ret = SGX_ERROR_UNEXPECTED;
@@ -163,17 +162,7 @@ extern "C" quote3_error_t tee_get_certificate_with_evidence(
if (func_ret != SGX_QL_SUCCESS)
break;
#else
if (!SHA256_Init(&sha_handle)) {
func_ret = SGX_QL_ERROR_UNEXPECTED;
break;
}
if (!SHA256_Update(&sha_handle, p_pub_key, public_key_size)) {
func_ret = SGX_QL_ERROR_UNEXPECTED;
break;
}
if (!SHA256_Final(reinterpret_cast<unsigned char *>(&report_data), &sha_handle)) {
if (!SHA256(p_pub_key, public_key_size, reinterpret_cast<unsigned char *>(&report_data))) {
func_ret = SGX_QL_ERROR_UNEXPECTED;
break;
}