From 592dbdd40fc837db07f27eabc28261d4985b55b4 Mon Sep 17 00:00:00 2001 From: Bartosz Gotowalski Date: Mon, 20 Oct 2025 10:29:52 +0200 Subject: [PATCH] Switch OpenSSL and SGXSSL to their long-term supported versions and ensure consistency across the project. Switches OpenSSL from version 3.1.6 to 3.0.17 (and from 3.0.13 to 3.0.17 in sample code) Updates SGXSSL from 3.1.6_Rev1 to 3.0_Rev5 (that runs on OpenSSL 3.0.17) Updates the dcap_source subproject commit reference to the one relying on OpenSSL 3.0.17 and SGXSSL 3.0_Rev5 --------- Signed-off-by: Bartosz Gotowalski --- SampleCode/SampleAttestedTLS/prepare_sgxssl.sh | 6 +++--- external/dcap_source | 2 +- external/sgxssl/prepare_sgxssl.sh | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SampleCode/SampleAttestedTLS/prepare_sgxssl.sh b/SampleCode/SampleAttestedTLS/prepare_sgxssl.sh index 45171008..f6e59cb1 100755 --- a/SampleCode/SampleAttestedTLS/prepare_sgxssl.sh +++ b/SampleCode/SampleAttestedTLS/prepare_sgxssl.sh @@ -35,13 +35,13 @@ project_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" echo "project_dir is $project_dir" sgxssl_dir=$project_dir/sgxssl openssl_out_dir=$sgxssl_dir/openssl_source -openssl_ver_name=openssl-3.0.13 +openssl_ver_name=openssl-3.0.17 intel_sgx_ssl_url=https://github.com/intel/intel-sgx-ssl support_tls_branch=support_tls_openssl3 build_script=$sgxssl_dir/Linux/build_openssl.sh server_url_path=https://www.openssl.org/source full_openssl_url=$server_url_path/$openssl_ver_name.tar.gz -full_openssl_url_old=$server_url_path/old/3.0.13/$openssl_ver_name.tar.gz +full_openssl_url_old=$server_url_path/old/3.0.17/$openssl_ver_name.tar.gz FileExists() { pushd $sgxssl_dir/Linux/ @@ -62,7 +62,7 @@ if [ $debug == true ] ; then read -n 1 -p "download souce code only, because we need to build ourselves" fi -openssl_chksum=88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313 +openssl_chksum=dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce rm -f check_sum_openssl.txt if [ ! -f $build_script ]; then git clone $intel_sgx_ssl_url -b $support_tls_branch $sgxssl_dir || exit 1 diff --git a/external/dcap_source b/external/dcap_source index d747b0ea..78bc1d6f 160000 --- a/external/dcap_source +++ b/external/dcap_source @@ -1 +1 @@ -Subproject commit d747b0eaf397eaaaf4f786b07c57244fc26209ef +Subproject commit 78bc1d6f0ba532b43a217bd86807130a6ef8d6ea diff --git a/external/sgxssl/prepare_sgxssl.sh b/external/sgxssl/prepare_sgxssl.sh index 1f1043a8..4be3e55d 100755 --- a/external/sgxssl/prepare_sgxssl.sh +++ b/external/sgxssl/prepare_sgxssl.sh @@ -32,16 +32,16 @@ top_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" openssl_out_dir=$top_dir/openssl_source -openssl_ver=3.1.6 +openssl_ver=3.0.17 openssl_ver_name=openssl-$openssl_ver sgxssl_github_archive=https://github.com/intel/intel-sgx-ssl/archive -sgxssl_file_name=3.1.6_Rev1 +sgxssl_file_name=3.0_Rev5 build_script=$top_dir/Linux/build_openssl.sh server_url_path=https://www.openssl.org/source/ full_openssl_url=$server_url_path/$openssl_ver_name.tar.gz -sgxssl_chksum=8fbacac2612f6117c11d04cd7989f1a035f978683a4626055133b2fbf332d016 -openssl_chksum=5d2be4036b478ef3cb0a854ca9b353072c3a0e26d8a56f8f0ab9fb6ed32d38d7 +sgxssl_chksum=9370c158b2ed468d96d41c0955da07e434f78c2b8beb2d31deb388472af428e7 +openssl_chksum=dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce 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