diff --git a/.gitignore b/.gitignore index 884629807..70046ba5e 100644 --- a/.gitignore +++ b/.gitignore @@ -156,6 +156,7 @@ deps/libev/libev-4.24/ #libssl deps/libssl/openssl-openssl-*/ +deps/libssl/openssl-3*/ #google coredumper deps/google-coredumper/google-coredumper/ diff --git a/deps/Makefile b/deps/Makefile index 5c5e4a7f2..13eed9c52 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -75,7 +75,7 @@ endif libinjection: libinjection/libinjection/src/libinjection.a libssl/openssl/libssl.a: - cd libssl && rm -rf openssl-openssl-*/ || true + cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true cd libssl && tar -zxf openssl-*.tar.gz 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 @@ -314,7 +314,7 @@ cleanall: cd libmicrohttpd && rm -f libmicrohttpd || true cd curl && rm -rf curl-*/ || true cd libev && rm -rf libev-*/ || true - cd libssl && rm -rf openssl-openssl-*/ || true + cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true cd libconfig && rm -rf libconfig-*/ || true cd prometheus-cpp && rm -rf prometheus-cpp-*/ || true cd cityhash && rm -rf cityhash/ || true diff --git a/deps/libssl/README.md b/deps/libssl/README.md index 89034858b..5181cbd5e 100644 --- a/deps/libssl/README.md +++ b/deps/libssl/README.md @@ -2,4 +2,10 @@ In ProxySQL 2.0.4 , libssl was upgrade from 1.1.0h to 1.1.1b . In ProxySQL 2.0.7 , libssl was downgraded back to 1.1.0h . See [bug 2244](https://github.com/sysown/proxysql/issues/2244) . +In ProxySQL 2.1.1 , libssl was upgraded to version 1.1.1j + +In ProxySQL 2.4.0 , libssl was upgraded from version 1.1.1j to 3.0.2 + Do not upgrade without extensive testing. + +See note about `struct bio_st` in MySQL_Data_Stream.cpp . diff --git a/deps/libssl/openssl b/deps/libssl/openssl index b34e4c8e6..fc4ded39a 120000 --- a/deps/libssl/openssl +++ b/deps/libssl/openssl @@ -1 +1 @@ -openssl-openssl-3.0.2 \ No newline at end of file +openssl-3.0.5 \ No newline at end of file diff --git a/deps/libssl/openssl-3.0.2.tar.gz b/deps/libssl/openssl-3.0.5.tar.gz similarity index 63% rename from deps/libssl/openssl-3.0.2.tar.gz rename to deps/libssl/openssl-3.0.5.tar.gz index cc14c547b..ea82eee29 100644 Binary files a/deps/libssl/openssl-3.0.2.tar.gz and b/deps/libssl/openssl-3.0.5.tar.gz differ