From: Matt Caswell <matt@openssl.org>
Date: Mon, 16 Apr 2018 13:06:56 +0000 (+0100)
Subject: Fix assertion failure in SSL_set_bio()
X-Git-Tag: OpenSSL_1_1_1-pre6~103
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bd7775e14a19c326d3720f2345c2ae324409e979;p=oweals%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5966)
---

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index b1d78dc35e..1e24f8446d 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -3844,8 +3844,6 @@ int ssl_free_wbio_buffer(SSL *s)
         return 1;
 
     s->wbio = BIO_pop(s->wbio);
-    if (!ossl_assert(s->wbio != NULL))
-        return 0;
     BIO_free(s->bbio);
     s->bbio = NULL;