Attachment 240371 Details for Bug 264180 – 26.4.13 patch

[patch] 26.4.13 patch

patch-databases-galera26-libressl35 (text/plain), 3.03 KB, created by Tassilo Philipp on 2023-02-24 12:43:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tassilo Philipp

Created: 2023-02-24 12:43:42 UTC

Size: 3.03 KB

patch

obsolete

>--- /dev/null
>+++ databases/galera26/files/patch-asio-asio-ssl-impl-context.ipp-libressl35
>@@ -0,0 +1,65 @@
>+--- asio/asio/ssl/impl/context.ipp.orig	2022-11-02 07:09:14.000000000 +0100
>++++ asio/asio/ssl/impl/context.ipp	2023-02-24 13:21:18.708505000 +0100
>+@@ -387,7 +387,7 @@
>+   if (handle_)
>+   {
>+ #if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++      && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \
>+     || defined(ASIO_USE_WOLFSSL)
>+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+ #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>+@@ -400,7 +400,7 @@
>+             cb_userdata);
>+       delete callback;
>+ #if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++      && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \
>+     || defined(ASIO_USE_WOLFSSL)
>+       ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0);
>+ #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>+@@ -739,7 +739,7 @@
>+   if (bio.p)
>+   {
>+ #if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++      && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \
>+     || defined(ASIO_USE_WOLFSSL)
>+     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
>+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+@@ -768,7 +768,7 @@
>+     }
>+ 
>+ #if ((OPENSSL_VERSION_NUMBER >= 0x10002000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++      && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \
>+     || defined(ASIO_USE_WOLFSSL)
>+     ::SSL_CTX_clear_chain_certs(handle_);
>+ #else
>+@@ -847,7 +847,7 @@
>+   ::ERR_clear_error();
>+ 
>+ #if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++      && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \
>+     || defined(ASIO_USE_WOLFSSL)
>+     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
>+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+@@ -916,7 +916,7 @@
>+   ::ERR_clear_error();
>+ 
>+ #if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++      && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \
>+     || defined(ASIO_USE_WOLFSSL)
>+     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
>+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+@@ -1157,7 +1157,7 @@
>+     detail::password_callback_base* callback, asio::error_code& ec)
>+ {
>+ #if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++      && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \
>+     || defined(ASIO_USE_WOLFSSL)
>+   void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+   ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback);

Actions: View | Diff

Attachments on bug 264180: 234154 | 240371 | 241538