diff options
author | schwarze <> | 2017-08-20 17:35:18 +0000 |
---|---|---|
committer | schwarze <> | 2017-08-20 17:35:18 +0000 |
commit | 3f3b8a801b16a1c8a2232c7a6da38533a4e8b342 (patch) | |
tree | f3b21604e81ae0d8d7f736353a22d7b106a7b97a | |
parent | d531af76dfc13a2772c8ce8d4017ff9a84b02dcc (diff) | |
download | openbsd-3f3b8a801b16a1c8a2232c7a6da38533a4e8b342.tar.gz openbsd-3f3b8a801b16a1c8a2232c7a6da38533a4e8b342.tar.bz2 openbsd-3f3b8a801b16a1c8a2232c7a6da38533a4e8b342.zip |
remove a duplicate BIO_do_accept() call from an example;
from Beat Bolli <dev at drbeat dot li>
via OpenSSL commit 7a67a3ba Jan 18 23:49:43 2017 +0100
-rw-r--r-- | src/lib/libssl/man/BIO_f_ssl.3 | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/lib/libssl/man/BIO_f_ssl.3 b/src/lib/libssl/man/BIO_f_ssl.3 index ec3114db28..5404b9c70f 100644 --- a/src/lib/libssl/man/BIO_f_ssl.3 +++ b/src/lib/libssl/man/BIO_f_ssl.3 | |||
@@ -1,5 +1,6 @@ | |||
1 | .\" $OpenBSD: BIO_f_ssl.3,v 1.4 2017/04/10 16:11:50 schwarze Exp $ | 1 | .\" $OpenBSD: BIO_f_ssl.3,v 1.5 2017/08/20 17:35:18 schwarze Exp $ |
2 | .\" OpenSSL f672aee4 Feb 9 11:52:40 2016 -0500 | 2 | .\" OpenSSL BIO_f_ssl.pod e90fc053 Jul 15 09:39:45 2017 -0400 |
3 | .\" OpenSSL BIO_f_ssl.pod f672aee4 Feb 9 11:52:40 2016 -0500 | ||
3 | .\" | 4 | .\" |
4 | .\" This file was written by Dr. Stephen Henson <steve@openssl.org>. | 5 | .\" This file was written by Dr. Stephen Henson <steve@openssl.org>. |
5 | .\" Copyright (c) 2000, 2003, 2009, 2014-2016 The OpenSSL Project. | 6 | .\" Copyright (c) 2000, 2003, 2009, 2014-2016 The OpenSSL Project. |
@@ -49,7 +50,7 @@ | |||
49 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 50 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
50 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 51 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
51 | .\" | 52 | .\" |
52 | .Dd $Mdocdate: April 10 2017 $ | 53 | .Dd $Mdocdate: August 20 2017 $ |
53 | .Dt BIO_F_SSL 3 | 54 | .Dt BIO_F_SSL 3 |
54 | .Os | 55 | .Os |
55 | .Sh NAME | 56 | .Sh NAME |
@@ -493,20 +494,13 @@ BIO_set_accept_bios(acpt,sbio); | |||
493 | 494 | ||
494 | out = BIO_new_fp(stdout, BIO_NOCLOSE); | 495 | out = BIO_new_fp(stdout, BIO_NOCLOSE); |
495 | 496 | ||
496 | /* Setup accept BIO */ | 497 | /* Wait for incoming connection */ |
497 | if (BIO_do_accept(acpt) <= 0) { | 498 | if (BIO_do_accept(acpt) <= 0) { |
498 | fprintf(stderr, "Error setting up accept BIO\en"); | 499 | fprintf(stderr, "Error setting up accept BIO\en"); |
499 | ERR_print_errors_fp(stderr); | 500 | ERR_print_errors_fp(stderr); |
500 | return 0; | 501 | return 0; |
501 | } | 502 | } |
502 | 503 | ||
503 | /* Now wait for incoming connection */ | ||
504 | if (BIO_do_accept(acpt) <= 0) { | ||
505 | fprintf(stderr, "Error in connection\en"); | ||
506 | ERR_print_errors_fp(stderr); | ||
507 | return 0; | ||
508 | } | ||
509 | |||
510 | /* We only want one connection so remove and free accept BIO */ | 504 | /* We only want one connection so remove and free accept BIO */ |
511 | 505 | ||
512 | sbio = BIO_pop(acpt); | 506 | sbio = BIO_pop(acpt); |
@@ -542,7 +536,7 @@ BIO_flush(sbio); | |||
542 | 536 | ||
543 | BIO_free_all(sbio); | 537 | BIO_free_all(sbio); |
544 | .Ed | 538 | .Ed |
545 | .Sh BUGS | 539 | .Sh HISTORY |
546 | In OpenSSL versions before 1.0.0 the | 540 | In OpenSSL versions before 1.0.0 the |
547 | .Xr BIO_pop 3 | 541 | .Xr BIO_pop 3 |
548 | call was handled incorrectly: | 542 | call was handled incorrectly: |