diff --git a/deps/libssl/README.md b/deps/libssl/README.md index eab127418f..cdce84d699 100644 --- a/deps/libssl/README.md +++ b/deps/libssl/README.md @@ -10,6 +10,8 @@ In ProxySQL 2.4.8 , libssl was upgraded from version 3.0.2 to 3.0.8 In ProxySQL 2.5.x , libssl was upgraded from version 3.0.8 to 3.1.0 +In ProxySQL 2.6.0 , libssl was upgraded from version 3.1.0 to 3.1.5 + Do not upgrade without extensive testing. diff --git a/deps/libssl/openssl b/deps/libssl/openssl index 462a8003af..53f42889e1 120000 --- a/deps/libssl/openssl +++ b/deps/libssl/openssl @@ -1 +1 @@ -openssl-3.1.4 \ No newline at end of file +openssl-3.1.5 \ No newline at end of file diff --git a/deps/libssl/openssl-3.1.4.tar.gz b/deps/libssl/openssl-3.1.5.tar.gz similarity index 63% rename from deps/libssl/openssl-3.1.4.tar.gz rename to deps/libssl/openssl-3.1.5.tar.gz index 97c9a36ddf..f31ce1129b 100644 Binary files a/deps/libssl/openssl-3.1.4.tar.gz and b/deps/libssl/openssl-3.1.5.tar.gz differ diff --git a/deps/libssl/verify-bio_st-match.sh b/deps/libssl/verify-bio_st-match.sh index b4903e032a..f90bbf6914 100755 --- a/deps/libssl/verify-bio_st-match.sh +++ b/deps/libssl/verify-bio_st-match.sh @@ -18,8 +18,14 @@ LIBBIOST=$(cd ../../; cat ./lib/mysql_data_stream.cpp | sed '/^\/\*/,/*\//d' | s echo -n "Comparing ... " if [[ "$LIBBIOST" == "$DEPBIOST" ]]; then - echo "PASS - bio_st is a match!"; + echo "PASS - bio_st is a match!" else - echo "FAIL - bio_st does not match!"; + echo "FAIL - bio_st does not match!" + echo + echo ">>> lib/mysql_data_stream.cpp" + echo "$LIBBIOST" + echo "===" + echo "$DEPBIOST" + echo "<<< deps/libssl/openssl/crypto/bio/bio_local.h" exit 1 fi