Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/libevent/dist Cherry-pick upstream fix for Libr...



details:   https://anonhg.NetBSD.org/src/rev/d464403d4874
branches:  trunk
changeset: 376454:d464403d4874
user:      rin <rin%NetBSD.org@localhost>
date:      Mon Jun 19 03:21:14 2023 +0000

description:
Cherry-pick upstream fix for LibreSSL. NFC for us at the moment.

https://github.com/libevent/libevent/commit/883630f76cbf512003b81de25cd96cb75c6cf0f9

 Don't define BIO_get_init() for LibreSSL 3.5+

 BIO_get_init() is available in LibreSSL 3.5 and later. The BIO type
 will become opaque, so the existing macro will break the build.

diffstat:

 external/bsd/libevent/dist/openssl-compat.h |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 858ede751642 -r d464403d4874 external/bsd/libevent/dist/openssl-compat.h
--- a/external/bsd/libevent/dist/openssl-compat.h       Mon Jun 19 03:03:11 2023 +0000
+++ b/external/bsd/libevent/dist/openssl-compat.h       Mon Jun 19 03:21:14 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: openssl-compat.h,v 1.1.1.2 2021/04/07 02:43:14 christos Exp $  */
+/*     $NetBSD: openssl-compat.h,v 1.2 2023/06/19 03:21:14 rin Exp $   */
 #ifndef OPENSSL_COMPAT_H
 #define OPENSSL_COMPAT_H
 
@@ -41,7 +41,8 @@ static inline BIO_METHOD *BIO_meth_new(i
 #endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
        (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */
 
-#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L && \
+       LIBRESSL_VERSION_NUMBER < 0x30500000L
 #define BIO_get_init(b) (b)->init
 #endif
 



Home | Main Index | Thread Index | Old Index