Initial commit
This commit is contained in:
@@ -0,0 +1,37 @@
|
||||
From f5ad737d73ed18b95ce63f1d8e933a89a26653e9 Mon Sep 17 00:00:00 2001
|
||||
From: Azat Khuzhin <azat@libevent.org>
|
||||
Date: Sat, 9 Jul 2022 14:22:38 +0300
|
||||
Subject: [PATCH] Add -Wundef for cmake and fix EVENT__SIZEOF_TIME_T usage
|
||||
|
||||
Note, autotools already supports it.
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
event-config.h.cmake | 3 +++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5ee0df2f7..9237252c7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -295,6 +295,7 @@ if (${GNUC})
|
||||
|
||||
list(APPEND __FLAGS
|
||||
-Wall -Wextra -Wno-unused-parameter -Wstrict-aliasing -Wstrict-prototypes
|
||||
+ -Wundef
|
||||
|
||||
-fno-strict-aliasing # gcc 2.9.5+
|
||||
-Wmissing-prototypes
|
||||
diff --git a/event-config.h.cmake b/event-config.h.cmake
|
||||
index 9fff34877..4a6267017 100644
|
||||
--- a/event-config.h.cmake
|
||||
+++ b/event-config.h.cmake
|
||||
@@ -485,6 +485,9 @@
|
||||
/* The size of 'void *', as computer by sizeof */
|
||||
#define EVENT__SIZEOF_VOID_P @EVENT__SIZEOF_VOID_P@
|
||||
|
||||
+/* The size of 'time_t', as computer by sizeof */
|
||||
+#define EVENT__SIZEOF_TIME_T @EVENT__SIZEOF_TIME_T@
|
||||
+
|
||||
/* Define to `__inline__' or `__inline' if that's what the C compiler
|
||||
calls it, or to nothing if 'inline' is not supported under any name. */
|
||||
#ifndef __cplusplus
|
||||
@@ -0,0 +1,74 @@
|
||||
commit 7f4684c0d362fefee8697ceed3f4f8642ed147ce
|
||||
Author: William Marlow <william.marlow@ibm.com>
|
||||
Date: Sat Jun 18 21:43:31 2022 +0100
|
||||
|
||||
Initial OpenSSL 3.0 support
|
||||
|
||||
* Don't use deprecated functions when building against OpenSSL 3.0.
|
||||
* Recognise that OpenSSL 3.0 can signal a dirty shutdown as a protocol.
|
||||
error in addition to the expected IO error produced by OpenSSL 1.1.1
|
||||
* Update regress_mbedtls.c for compatibility with OpenSSL 3
|
||||
|
||||
(cherry picked from commit 29c420c418aeb497e5e8b7abd45dee39194ca5fc)
|
||||
|
||||
Conflicts:
|
||||
bufferevent_openssl.c
|
||||
sample/becat.c
|
||||
test/regress_mbedtls.c
|
||||
|
||||
diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c
|
||||
index b51b834b..520e2d6f 100644
|
||||
--- a/bufferevent_openssl.c
|
||||
+++ b/bufferevent_openssl.c
|
||||
@@ -514,7 +514,9 @@ conn_closed(struct bufferevent_openssl *bev_ssl, int when, int errcode, int ret)
|
||||
put_error(bev_ssl, errcode);
|
||||
break;
|
||||
case SSL_ERROR_SSL:
|
||||
- /* Protocol error. */
|
||||
+ /* Protocol error; possibly a dirty shutdown. */
|
||||
+ if (ret == 0 && SSL_is_init_finished(bev_ssl->ssl) == 0)
|
||||
+ dirty_shutdown = 1;
|
||||
put_error(bev_ssl, errcode);
|
||||
break;
|
||||
case SSL_ERROR_WANT_X509_LOOKUP:
|
||||
diff --git a/sample/le-proxy.c b/sample/le-proxy.c
|
||||
index 13e0e2ae..e9af3c68 100644
|
||||
--- a/sample/le-proxy.c
|
||||
+++ b/sample/le-proxy.c
|
||||
@@ -112,10 +112,15 @@ eventcb(struct bufferevent *bev, short what, void *ctx)
|
||||
ERR_reason_error_string(err);
|
||||
const char *lib = (const char*)
|
||||
ERR_lib_error_string(err);
|
||||
+#if OPENSSL_VERSION_MAJOR >= 3
|
||||
+ fprintf(stderr,
|
||||
+ "%s in %s\n", msg, lib);
|
||||
+#else
|
||||
const char *func = (const char*)
|
||||
ERR_func_error_string(err);
|
||||
fprintf(stderr,
|
||||
"%s in %s %s\n", msg, lib, func);
|
||||
+#endif
|
||||
}
|
||||
if (errno)
|
||||
perror("connection error");
|
||||
diff --git a/test/regress_ssl.c b/test/regress_ssl.c
|
||||
index 37dc334d..490be9b2 100644
|
||||
--- a/test/regress_ssl.c
|
||||
+++ b/test/regress_ssl.c
|
||||
@@ -374,7 +374,16 @@ eventcb(struct bufferevent *bev, short what, void *ctx)
|
||||
++n_connected;
|
||||
ssl = bufferevent_openssl_get_ssl(bev);
|
||||
tt_assert(ssl);
|
||||
+#if OPENSSL_VERSION_MAJOR >= 3
|
||||
+ /* SSL_get1_peer_certificate() means we want
|
||||
+ * to increase the reference count on the cert
|
||||
+ * and so we will need to free it ourselves later
|
||||
+ * when we're done with it. The non-reference count
|
||||
+ * increasing version is not available in OpenSSL 1.1.1. */
|
||||
+ peer_cert = SSL_get1_peer_certificate(ssl);
|
||||
+#else
|
||||
peer_cert = SSL_get_peer_certificate(ssl);
|
||||
+#endif
|
||||
if (type & REGRESS_OPENSSL_SERVER) {
|
||||
tt_assert(peer_cert == NULL);
|
||||
} else {
|
||||
@@ -0,0 +1,40 @@
|
||||
[build]
|
||||
type = "cmake"
|
||||
|
||||
[build.flags]
|
||||
build_dir = "build"
|
||||
configure = [
|
||||
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5",
|
||||
"-DCMAKE_SKIP_INSTALL_RPATH=TRUE",
|
||||
"-DEVENT__DISABLE_REGRESS=OFF",
|
||||
"-DEVENT__LIBRARY_TYPE=SHARED",
|
||||
"-G Ninja",
|
||||
]
|
||||
|
||||
[dependencies]
|
||||
build = [
|
||||
"cmake",
|
||||
"ninja",
|
||||
"python",
|
||||
]
|
||||
runtime = [
|
||||
"glibc",
|
||||
"openssl",
|
||||
]
|
||||
|
||||
[package]
|
||||
description = "Event notification library"
|
||||
homepage = "https://libevent.org/"
|
||||
license = "BSD-3-Clause-Modification"
|
||||
name = "libevent"
|
||||
version = "2.1.12"
|
||||
|
||||
[[source]]
|
||||
extract_dir = "$name-$version"
|
||||
sha256 = "92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb"
|
||||
url = "https://github.com/libevent/libevent/releases/download/release-$version-stable/libevent-$version-stable.tar.gz"
|
||||
patches = [ "EVENT__SIZEOF_TIME_T.patch", "libevent-2.1.12-openssl-compat.patch" ]
|
||||
|
||||
[[manual_sources]]
|
||||
files = [ "EVENT__SIZEOF_TIME_T.patch", "libevent-2.1.12-openssl-compat.patch" ]
|
||||
|
||||
Reference in New Issue
Block a user