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

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  1d015368ebe245c4468522d152edfd8a1069426e (commit)
      from  8917c8909ab0f63cf5812bfc9cba7cbb9ccb5210 (commit)


- Log -----------------------------------------------------------------
commit 1d015368ebe245c4468522d152edfd8a1069426e
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Apr 16 14:06:56 2018 +0100

    Fix assertion failure in SSL_set_bio()
    
    If SSL_set_bio() is called with a NULL wbio after a failed connection then
    this can trigger an assertion failure. This should be valid behaviour and
    the assertion is in fact invalid and can simply be removed.
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5966)
    
    (cherry picked from commit bd7775e14a19c326d3720f2345c2ae324409e979)

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

Summary of changes:
 ssl/ssl_lib.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 8a190d2..a1a514f 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -3519,7 +3519,6 @@ void ssl_free_wbio_buffer(SSL *s)
         return;
 
     s->wbio = BIO_pop(s->wbio);
-    assert(s->wbio != NULL);
     BIO_free(s->bbio);
     s->bbio = NULL;
 }