Merge pull request #4561 from sysown/v2.6.x-update_to_openssl_3.3.1

update OpenSSL to v 3.3.1
sysown · Jul 1, 2024 · d0ff320 · d0ff320
2 parents 1e048ce + e7c336e
commit d0ff320
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/deps/libssl/openssl b/deps/libssl/openssl
@@ -1 +1 @@
-openssl-3.2.1
+openssl-3.3.1
diff --git a/deps/libssl/openssl-3.2.1.tar.gz → deps/libssl/openssl-3.3.1.tar.gz b/deps/libssl/openssl-3.2.1.tar.gz → deps/libssl/openssl-3.3.1.tar.gz
diff --git a/lib/mysql_data_stream.cpp b/lib/mysql_data_stream.cpp
@@ -67,8 +67,8 @@ struct bio_st {
     CRYPTO_RWLOCK *lock;
 };
 
-#elif (OPENSSL_VERSION_NUMBER & 0xFFFF0000) == 0x30200000
-#pragma message "libssl 3.2.x detected"
+#elif (OPENSSL_VERSION_NUMBER & 0xFFFF0000) == 0x30200000 || (OPENSSL_VERSION_NUMBER & 0xFFFF0000) == 0x30300000
+#pragma message "libssl 3.2.x / 3.3.x detected"
 struct bio_st {
     OSSL_LIB_CTX *libctx;
     const BIO_METHOD *method;