summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbluhm <bluhm@openbsd.org>2017-03-03 20:26:23 +0000
committerbluhm <bluhm@openbsd.org>2017-03-03 20:26:23 +0000
commite63efc4e6e56edbadc0b9d9c319698f77a4d69ac (patch)
tree4fff27f3d475a263b45f151db1ab836935b43b76
parentRemove a "=over 4" after the corresponding "=back" has been removed (diff)
downloadwireguard-openbsd-e63efc4e6e56edbadc0b9d9c319698f77a4d69ac.tar.xz
wireguard-openbsd-e63efc4e6e56edbadc0b9d9c319698f77a4d69ac.zip
Internally libssl uses 16k buffer, the libevent TLS wrapper uses
4k read buffer. This can hang ldapd(8). Setting both to 16k improves the situation. report Seiya Kawashima; feedback Robert Klein; test and OK gsoares@
-rw-r--r--usr.sbin/ldapd/evbuffer_tls.c4
-rw-r--r--usr.sbin/syslogd/evbuffer_tls.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/ldapd/evbuffer_tls.c b/usr.sbin/ldapd/evbuffer_tls.c
index b0d0e2ee771..b7bbe3b4e4c 100644
--- a/usr.sbin/ldapd/evbuffer_tls.c
+++ b/usr.sbin/ldapd/evbuffer_tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evbuffer_tls.c,v 1.1 2016/05/01 00:32:37 jmatthew Exp $ */
+/* $OpenBSD: evbuffer_tls.c,v 1.2 2017/03/03 20:26:23 bluhm Exp $ */
/*
* Copyright (c) 2002-2004 Niels Provos <provos@citi.umich.edu>
@@ -289,7 +289,7 @@ buffertls_connect(struct buffertls *buftls, int fd)
* Reads data from a file descriptor into a buffer.
*/
-#define EVBUFFER_MAX_READ 4096
+#define EVBUFFER_MAX_READ 16384
int
evtls_read(struct evbuffer *buf, int fd, int howmuch, struct tls *ctx)
diff --git a/usr.sbin/syslogd/evbuffer_tls.c b/usr.sbin/syslogd/evbuffer_tls.c
index c1a081fb7cf..dd212e12721 100644
--- a/usr.sbin/syslogd/evbuffer_tls.c
+++ b/usr.sbin/syslogd/evbuffer_tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evbuffer_tls.c,v 1.9 2015/10/09 16:58:25 bluhm Exp $ */
+/* $OpenBSD: evbuffer_tls.c,v 1.10 2017/03/03 20:26:23 bluhm Exp $ */
/*
* Copyright (c) 2002-2004 Niels Provos <provos@citi.umich.edu>
@@ -289,7 +289,7 @@ buffertls_connect(struct buffertls *buftls, int fd)
* Reads data from a file descriptor into a buffer.
*/
-#define EVBUFFER_MAX_READ 4096
+#define EVBUFFER_MAX_READ 16384
int
evtls_read(struct evbuffer *buf, int fd, int howmuch, struct tls *ctx)