summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2020-05-24 15:12:54 +0000
committerjsing <>2020-05-24 15:12:54 +0000
commit2212d9a0f501cbdaf1b71d000f925fb3778b99fd (patch)
tree1b49960ac4143de22e4b6df8394a1189b467afab
parent2cf326c9539514d11a4cad4647b09d1c3e8e1d48 (diff)
downloadopenbsd-2212d9a0f501cbdaf1b71d000f925fb3778b99fd.tar.gz
openbsd-2212d9a0f501cbdaf1b71d000f925fb3778b99fd.tar.bz2
openbsd-2212d9a0f501cbdaf1b71d000f925fb3778b99fd.zip
Clear SSL_MODE_AUTO_RETRY in libtls, since we handle WANT_POLLIN correctly.
-rw-r--r--src/lib/libtls/tls.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c
index 1931f4838a..3d6723bbd9 100644
--- a/src/lib/libtls/tls.c
+++ b/src/lib/libtls/tls.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls.c,v 1.84 2020/01/20 08:39:21 jsing Exp $ */ 1/* $OpenBSD: tls.c,v 1.85 2020/05/24 15:12:54 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -405,6 +405,8 @@ tls_configure_ssl_keypair(struct tls *ctx, SSL_CTX *ssl_ctx,
405int 405int
406tls_configure_ssl(struct tls *ctx, SSL_CTX *ssl_ctx) 406tls_configure_ssl(struct tls *ctx, SSL_CTX *ssl_ctx)
407{ 407{
408 SSL_CTX_clear_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
409
408 SSL_CTX_set_mode(ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE); 410 SSL_CTX_set_mode(ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
409 SSL_CTX_set_mode(ssl_ctx, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER); 411 SSL_CTX_set_mode(ssl_ctx, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
410 412