Module Name: src
Committed By: rin
Date: Mon Jun 19 03:21:14 UTC 2023
Modified Files:
src/external/bsd/libevent/dist: openssl-compat.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/libevent/dist/openssl-compat.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libevent/dist/openssl-compat.h
diff -u src/external/bsd/libevent/dist/openssl-compat.h:1.1.1.2 src/external/bsd/libevent/dist/openssl-compat.h:1.2
--- src/external/bsd/libevent/dist/openssl-compat.h:1.1.1.2 Wed Apr 7 02:43:14 2021
+++ src/external/bsd/libevent/dist/openssl-compat.h Mon Jun 19 03:21:14 2023
@@ -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
