summaryrefslogtreecommitdiff
path: root/lib/libcrypto/bio
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-11-21 18:15:41 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-11-21 18:15:41 +0000
commit0105f37f4b62c46ae3723f697a4085525628a417 (patch)
tree83210207fcc95742f7a29f7df8ff5f9b655ec6b7 /lib/libcrypto/bio
parentc0dac9814bd8dfc261670c88b362e31b4ae2ce53 (diff)
MPE support, begone. ok tedu
Diffstat (limited to 'lib/libcrypto/bio')
-rw-r--r--lib/libcrypto/bio/bss_conn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libcrypto/bio/bss_conn.c b/lib/libcrypto/bio/bss_conn.c
index 5120dabcb57..e55fc2d163d 100644
--- a/lib/libcrypto/bio/bss_conn.c
+++ b/lib/libcrypto/bio/bss_conn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_conn.c,v 1.30 2014/07/13 16:03:09 beck Exp $ */
+/* $OpenBSD: bss_conn.c,v 1.31 2014/11/21 18:15:40 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -218,7 +218,7 @@ conn_state(BIO *b, BIO_CONNECT *c)
}
c->state = BIO_CONN_S_CONNECT;
-#if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE)
+#if defined(SO_KEEPALIVE)
i = 1;
i = setsockopt(b->num, SOL_SOCKET, SO_KEEPALIVE,(char *)&i, sizeof(i));
if (i < 0) {