[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  daaaa3cb7e506466b38de995b3e5149f4045bdff (commit)
      from  c8b93876f116e761e6427594c183ee4e82c6bda5 (commit)


- Log -----------------------------------------------------------------
commit daaaa3cb7e506466b38de995b3e5149f4045bdff
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Mon Jul 17 11:51:19 2017 +0200

    Fix bogus use of BIO_sock_should_retry.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3948)

-----------------------------------------------------------------------

Summary of changes:
 apps/s_socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/s_socket.c b/apps/s_socket.c
index b2bf244..804ab5b 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -215,7 +215,7 @@ int do_server(int *accept_sock, const char *host, const char *port,
         if (type == SOCK_STREAM) {
             do {
                 sock = BIO_accept_ex(asock, NULL, 0);
-            } while (sock < 0 && BIO_sock_should_retry(ret));
+            } while (sock < 0 && BIO_sock_should_retry(sock));
             if (sock < 0) {
                 ERR_print_errors(bio_err);
                 BIO_closesocket(asock);