From 501278b1e9c2598c65215f3fe11d887ee0e0c6a0 Mon Sep 17 00:00:00 2001 From: Yashwant Sahu Date: Wed, 30 Oct 2024 21:29:18 +0530 Subject: [PATCH] Removed verify-bio_st-match.sh file as we don't need to verify bio internal structure now. --- deps/Makefile | 1 - deps/libssl/README.md | 3 --- deps/libssl/verify-bio_st-match.sh | 31 ------------------------------ 3 files changed, 35 deletions(-) delete mode 100755 deps/libssl/verify-bio_st-match.sh diff --git a/deps/Makefile b/deps/Makefile index 0361352be7..c70271d78e 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -73,7 +73,6 @@ libinjection: libinjection/libinjection/src/libinjection.a libssl/openssl/libssl.a: cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true cd libssl && tar -zxf openssl-*.tar.gz - cd libssl && ./verify-bio_st-match.sh # cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch # cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch cd libssl/openssl && ./config no-ssl3 no-tests diff --git a/deps/libssl/README.md b/deps/libssl/README.md index eab127418f..089d2e43a8 100644 --- a/deps/libssl/README.md +++ b/deps/libssl/README.md @@ -13,6 +13,3 @@ In ProxySQL 2.5.x , libssl was upgraded from version 3.0.8 to 3.1.0 Do not upgrade without extensive testing. -See note about `struct bio_st` in MySQL_Data_Stream.cpp . - -Run `verify-bio_st-match.sh` to confirm compatibility. diff --git a/deps/libssl/verify-bio_st-match.sh b/deps/libssl/verify-bio_st-match.sh deleted file mode 100755 index 137f6cfee0..0000000000 --- a/deps/libssl/verify-bio_st-match.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -# make sure we have correct cwd -pushd $(dirname $0) &>/dev/null -trap 'popd &>/dev/null' EXIT - -echo "checking for 'deps/libssl/openssl/crypto/bio/bio_local.h'" -if [[ ! -e './openssl/crypto/bio/bio_local.h' ]]; then - echo "extracting 'openssl-*.tar.gz'" - tar -zxf openssl-*.tar.gz -fi - -echo "extracting 'struct bio_st' from 'deps/libssl/openssl/crypto/bio/bio_local.h'" -DEPBIOST=$(cd ../../; cat ./deps/libssl/openssl/crypto/bio/bio_local.h | sed -n '/^struct bio_st {/,/}/p') - -echo "extracting 'struct bio_st' from 'lib/mysql_data_stream.cpp'" -LIBBIOST=$(cd ../../; cat ./lib/mysql_data_stream.cpp | sed '/^\/\*/,/*\//d' | sed -n '/^struct bio_st {/,/}/p') - -echo -n "Comparing ... " -if [[ "$LIBBIOST" =~ "$DEPBIOST" ]]; then - echo "PASS - bio_st is a match!" -else - 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