summaryrefslogtreecommitdiffstats
path: root/cassandra-cpp-driver-openssl3.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-08-18 19:37:47 +0200
committerRemi Collet <remi@php.net>2023-08-18 19:37:47 +0200
commitbbb4d08c2d3e9856edea1dd01ab735af3659c1e2 (patch)
tree528118445e072285e312f2b8794badb68f62439e /cassandra-cpp-driver-openssl3.patch
parent0ed3ac53f6136a1c7e682ed1330d3cd3c3219a3e (diff)
update to 2.16.2
Diffstat (limited to 'cassandra-cpp-driver-openssl3.patch')
-rw-r--r--cassandra-cpp-driver-openssl3.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/cassandra-cpp-driver-openssl3.patch b/cassandra-cpp-driver-openssl3.patch
deleted file mode 100644
index 7e26495..0000000
--- a/cassandra-cpp-driver-openssl3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 71f2f6df263871bf56372160291f47e81856046c Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 10 Nov 2021 16:36:40 +0100
-Subject: [PATCH] drop deprecated call with OpenSSL 3.0
-
----
- src/ssl/ssl_openssl_impl.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/ssl/ssl_openssl_impl.cpp b/src/ssl/ssl_openssl_impl.cpp
-index 3b1124378..90f8ba631 100644
---- a/src/ssl/ssl_openssl_impl.cpp
-+++ b/src/ssl/ssl_openssl_impl.cpp
-@@ -91,7 +91,11 @@ static void ssl_log_errors(const char* context) {
- const char* data;
- int flags;
- int err;
-+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
-+ while ((err = ERR_get_error_all(NULL, NULL, NULL, &data, &flags)) != 0) {
-+#else
- while ((err = ERR_get_error_line_data(NULL, NULL, &data, &flags)) != 0) {
-+#endif
- char buf[256];
- ERR_error_string_n(err, buf, sizeof(buf));
- LOG_ERROR("%s: %s:%s", context, buf, (flags & ERR_TXT_STRING) ? data : "");
-@@ -104,7 +108,11 @@ static String ssl_error_string() {
- int flags;
- int err;
- String error;
-+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
-+ while ((err = ERR_get_error_all(NULL, NULL, NULL, &data, &flags)) != 0) {
-+#else
- while ((err = ERR_get_error_line_data(NULL, NULL, &data, &flags)) != 0) {
-+#endif
- char buf[256];
- ERR_error_string_n(err, buf, sizeof(buf));
- if (!error.empty()) error.push_back(',');