Merge pull request #4007 from sysown/v2.x-openssl_3.0.7

update to openssl 3.0.7
sysown · Nov 29, 2022 · fa0bcfd · fa0bcfd
2 parents 8a44ce1 + b81d865
commit fa0bcfd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/deps/libssl/openssl b/deps/libssl/openssl
@@ -1 +1 @@
-openssl-3.0.5
+openssl-openssl-3.0.7
diff --git a/deps/libssl/openssl-3.0.5.tar.gz → deps/libssl/openssl-3.0.7.tar.gz b/deps/libssl/openssl-3.0.5.tar.gz → deps/libssl/openssl-3.0.7.tar.gz
diff --git a/deps/libssl/verify-bio_st-match.sh b/deps/libssl/verify-bio_st-match.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# make sure we have correct cwd
+pushd $(dirname $0) &>/dev/null
+trap 'popd &>/dev/null' EXIT
+
+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!";
+	exit 1
+fi