Skip to content

Commit

Permalink
Linux 2.15.1 Open Source Gold Release
Browse files Browse the repository at this point in the history
Upgraded to OpenSSL 1.1.1l

Signed-off-by: Li, Xun <xun.li@intel.com>
  • Loading branch information
llly committed Nov 18, 2021
1 parent e6d626d commit a59e51e
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 21 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,12 @@ To install the Intel(R) SGX SDK, invoke the installer, as follows:
$ cd linux/installer/bin
$ ./sgx_linux_x64_sdk_${version}.bin
```
The above command requires you to specify the installation path. You can use the following command
to use the non-interactive installation mode:
```
$ cd linux/installer/bin
$ ./sgx_linux_x64_sdk_${version}.bin --prefix {SDK_INSTALL_PATH_PREFIX}
```
NOTE: You need to set up the needed environment variables before compiling your code. To do so, run:
```
$ source ${sgx-sdk-install-path}/environment
Expand Down
16 changes: 8 additions & 8 deletions common/inc/internal/se_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@
#ifndef _SE_VERSION_H_
#define _SE_VERSION_H_

#define STRFILEVER "2.15.100.3"
#define STRFILEVER "2.15.101.1"
#define SGX_MAJOR_VERSION 2
#define SGX_MINOR_VERSION 15
#define SGX_REVISION_VERSION 100
#define SGX_REVISION_VERSION 101
#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) 2021 Intel Corporation"

#define UAE_SERVICE_VERSION "2.3.212.3"
#define URTS_VERSION "1.1.116.3"
#define ENCLAVE_COMMON_VERSION "1.1.119.3"
#define LAUNCH_VERSION "1.0.114.3"
#define EPID_VERSION "1.0.114.3"
#define QUOTE_EX_VERSION "1.1.114.3"
#define UAE_SERVICE_VERSION "2.3.213.1"
#define URTS_VERSION "1.1.117.1"
#define ENCLAVE_COMMON_VERSION "1.1.120.1"
#define LAUNCH_VERSION "1.0.115.1"
#define EPID_VERSION "1.0.115.1"
#define QUOTE_EX_VERSION "1.1.115.1"

#endif
8 changes: 4 additions & 4 deletions download_prebuilt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@

top_dir=`dirname $0`
out_dir=$top_dir
optlib_name=optimized_libs_2.15.tar.gz
ae_file_name=prebuilt_ae_2.15.tar.gz
optlib_name=optimized_libs_2.15.1.tar.gz
ae_file_name=prebuilt_ae_2.15.1.tar.gz
binutils_file_name=as.ld.objdump.r4.tar.gz
checksum_file=SHA256SUM_prebuilt_2.15.cfg
server_url_path=https://download.01.org/intel-sgx/sgx-linux/2.15
checksum_file=SHA256SUM_prebuilt_2.15.1.cfg
server_url_path=https://download.01.org/intel-sgx/sgx-linux/2.15.1
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
Expand Down
8 changes: 3 additions & 5 deletions external/sgxssl/prepare_sgxssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,16 @@

top_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
openssl_out_dir=$top_dir/openssl_source
openssl_ver=1.1.1k
openssl_ver=1.1.1l
openssl_ver_name=openssl-$openssl_ver
sgxssl_github_archive=https://github.com/intel/intel-sgx-ssl/archive
sgxssl_ver=2.14
sgxssl_ver_name=v$sgx_ver
sgxssl_file_name=lin_$sgxssl_ver\_$openssl_ver
sgxssl_file_name=lin_2.14_1.1.1k
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=825e58823f2ec39bcfb69c2c62cc4e769bdac057ade10b362cdeac1f5a563954
openssl_chksum=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5
openssl_chksum=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
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
Expand Down
6 changes: 3 additions & 3 deletions linux/reproducibility/build_and_launch_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ mount_dir="/linux-sgx"
sdk_installer=""
sgx_src=""

default_sdk_installer=sgx_linux_x64_sdk_reproducible_2.15.100.1.bin
default_sdk_installer_url=https://download.01.org/intel-sgx/sgx-linux/2.15/distro/nix_reproducibility/$default_sdk_installer
default_sdk_installer=sgx_linux_x64_sdk_reproducible_2.15.101.1.bin
default_sdk_installer_url=https://download.01.org/intel-sgx/sgx-linux/2.15.1/distro/nix_reproducibility/$default_sdk_installer


usage()
Expand Down Expand Up @@ -179,7 +179,7 @@ prepare_sgx_src()
if [ "$sgx_src" != "" ]; then
mkdir -p "$sgx_repo" && cp -a "$sgx_src/." "$sgx_repo"
else
git clone -b sgx_2.15_reproducible https://github.com/intel/linux-sgx.git $sgx_repo
git clone -b sgx_2.15.101_reproducible https://github.com/intel/linux-sgx.git $sgx_repo
fi

cd "$sgx_repo" && make preparation
Expand Down

0 comments on commit a59e51e

Please sign in to comment.