[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

bernd.edlinger at hotmail.de bernd.edlinger at hotmail.de
Mon Jul 17 13:38:26 UTC 2017


The branch OpenSSL_1_1_0-stable has been updated
       via  56c13d2bfa1983d71bcfcc5dfaf3592c5c6978e2 (commit)
      from  2f0af52b423368e8fa7a6f532f945812e88c809d (commit)


- Log -----------------------------------------------------------------
commit 56c13d2bfa1983d71bcfcc5dfaf3592c5c6978e2
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)
    
    (cherry picked from commit daaaa3cb7e506466b38de995b3e5149f4045bdff)

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

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 0cbe885..7f01112 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -171,7 +171,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);


More information about the openssl-commits mailing list