[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a043d0b91d62fd8526a3fd791e3ad2ebcf888cd9 (commit)
      from  098a23828fb8914e39f8d441a57e1c6486d8d97c (commit)


- Log -----------------------------------------------------------------
commit a043d0b91d62fd8526a3fd791e3ad2ebcf888cd9
Author: Davide Galassi <davide.galassi at gmail.com>
Date:   Mon Apr 18 15:48:27 2016 +0200

    BIO socket connect failure was not handled correctly.
    The state was always set to BIO_CONN_S_OK.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/bio/bss_conn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index a4949b3..c1abe87 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -198,7 +198,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
             ret = BIO_connect(b->num, BIO_ADDRINFO_address(c->addr_iter),
                               BIO_SOCK_KEEPALIVE | c->connect_mode);
             b->retry_reason = 0;
-            if (ret < 0) {
+            if (ret == 0) {
                 if (BIO_sock_should_retry(ret)) {
                     BIO_set_retry_special(b);
                     c->state = BIO_CONN_S_BLOCKED_CONNECT;