commit: 33597f8c7187f3404dcc2c3f42b70c0cad218509 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Mon May 5 05:16:34 2025 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Mon May 5 05:16:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=33597f8c
net-wireless/hostapd: update patch for LibreSSL 4.1.0 Signed-off-by: orbea <orbea <AT> riseup.net> .../hostapd/files/hostapd-2.10-libressl.patch | 21 +++++++++------------ .../hostapd/files/hostapd-2.11-libressl.patch | 9 +++++++++ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/net-wireless/hostapd/files/hostapd-2.10-libressl.patch b/net-wireless/hostapd/files/hostapd-2.10-libressl.patch index 268cc27..3140d32 100644 --- a/net-wireless/hostapd/files/hostapd-2.10-libressl.patch +++ b/net-wireless/hostapd/files/hostapd-2.10-libressl.patch @@ -1,15 +1,3 @@ -From 87deed487d8f27feb7c6f8180535e67d9e1847ca Mon Sep 17 00:00:00 2001 -From: orbea <[email protected]> -Date: Wed, 6 Jul 2022 17:24:11 -0700 -Subject: [PATCH] Fix build with libressl-3.5.x - -Fails with a undefined reference to SSL_set_cert_cb. ---- - src/crypto/tls_openssl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c -index c9e00b3..5f44a73 100644 --- a/src/crypto/tls_openssl.c +++ b/src/crypto/tls_openssl.c @@ -3048,7 +3048,7 @@ static int tls_set_conn_flags(struct tls_connection *conn, unsigned int flags, @@ -21,3 +9,12 @@ index c9e00b3..5f44a73 100644 if (flags & TLS_CONN_SUITEB_NO_ECDH) { const char *ciphers = "DHE-RSA-AES256-GCM-SHA384"; +@@ -5538,7 +5538,7 @@ int tls_global_set_params(void *tls_ctx, + * commented out unless explicitly needed for EAP-FAST in order to be able to + * build this file with unmodified openssl. */ + +-#if (defined(OPENSSL_IS_BORINGSSL) || OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#if (defined(OPENSSL_IS_BORINGSSL) || OPENSSL_VERSION_NUMBER >= 0x10100000L) && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x4010000fL) + static int tls_sess_sec_cb(SSL *s, void *secret, int *secret_len, + STACK_OF(SSL_CIPHER) *peer_ciphers, + const SSL_CIPHER **cipher, void *arg) diff --git a/net-wireless/hostapd/files/hostapd-2.11-libressl.patch b/net-wireless/hostapd/files/hostapd-2.11-libressl.patch index 450946c..b90b261 100644 --- a/net-wireless/hostapd/files/hostapd-2.11-libressl.patch +++ b/net-wireless/hostapd/files/hostapd-2.11-libressl.patch @@ -22,3 +22,12 @@ #ifdef OPENSSL_IS_BORINGSSL if (openssl_ciphers && os_strcmp(openssl_ciphers, "SUITEB192") == 0) { +@@ -5778,7 +5786,7 @@ int tls_global_set_params(void *tls_ctx, + * commented out unless explicitly needed for EAP-FAST in order to be able to + * build this file with unmodified openssl. */ + +-#if (defined(OPENSSL_IS_BORINGSSL) || OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#if (defined(OPENSSL_IS_BORINGSSL) || OPENSSL_VERSION_NUMBER >= 0x10100000L) && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x4010000fL) + static int tls_sess_sec_cb(SSL *s, void *secret, int *secret_len, + STACK_OF(SSL_CIPHER) *peer_ciphers, + const SSL_CIPHER **cipher, void *arg)
