diff options
| author | deraadt <> | 2014-11-21 18:15:40 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-11-21 18:15:40 +0000 |
| commit | be0835a51aef5352fa10e513a8290235480171ca (patch) | |
| tree | 6089fa777ad1a67dcfabad48b6ee53b62007e7f5 | |
| parent | 969d8f3a5aa82d6c4365114f498b9aa1c93dc8d9 (diff) | |
| download | openbsd-be0835a51aef5352fa10e513a8290235480171ca.tar.gz openbsd-be0835a51aef5352fa10e513a8290235480171ca.tar.bz2 openbsd-be0835a51aef5352fa10e513a8290235480171ca.zip | |
MPE support, begone. ok tedu
| -rw-r--r-- | src/lib/libcrypto/bio/bss_conn.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/bio/bss_conn.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index 5120dabcb5..e55fc2d163 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bss_conn.c,v 1.30 2014/07/13 16:03:09 beck Exp $ */ | 1 | /* $OpenBSD: bss_conn.c,v 1.31 2014/11/21 18:15:40 deraadt Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -218,7 +218,7 @@ conn_state(BIO *b, BIO_CONNECT *c) | |||
| 218 | } | 218 | } |
| 219 | c->state = BIO_CONN_S_CONNECT; | 219 | c->state = BIO_CONN_S_CONNECT; |
| 220 | 220 | ||
| 221 | #if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE) | 221 | #if defined(SO_KEEPALIVE) |
| 222 | i = 1; | 222 | i = 1; |
| 223 | i = setsockopt(b->num, SOL_SOCKET, SO_KEEPALIVE,(char *)&i, sizeof(i)); | 223 | i = setsockopt(b->num, SOL_SOCKET, SO_KEEPALIVE,(char *)&i, sizeof(i)); |
| 224 | if (i < 0) { | 224 | if (i < 0) { |
diff --git a/src/lib/libssl/src/crypto/bio/bss_conn.c b/src/lib/libssl/src/crypto/bio/bss_conn.c index 5120dabcb5..e55fc2d163 100644 --- a/src/lib/libssl/src/crypto/bio/bss_conn.c +++ b/src/lib/libssl/src/crypto/bio/bss_conn.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bss_conn.c,v 1.30 2014/07/13 16:03:09 beck Exp $ */ | 1 | /* $OpenBSD: bss_conn.c,v 1.31 2014/11/21 18:15:40 deraadt Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -218,7 +218,7 @@ conn_state(BIO *b, BIO_CONNECT *c) | |||
| 218 | } | 218 | } |
| 219 | c->state = BIO_CONN_S_CONNECT; | 219 | c->state = BIO_CONN_S_CONNECT; |
| 220 | 220 | ||
| 221 | #if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE) | 221 | #if defined(SO_KEEPALIVE) |
| 222 | i = 1; | 222 | i = 1; |
| 223 | i = setsockopt(b->num, SOL_SOCKET, SO_KEEPALIVE,(char *)&i, sizeof(i)); | 223 | i = setsockopt(b->num, SOL_SOCKET, SO_KEEPALIVE,(char *)&i, sizeof(i)); |
| 224 | if (i < 0) { | 224 | if (i < 0) { |