[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  56d909863dcff26e82ebb06d185668f00287f67b (commit)
      from  e3d1a4e56572c71db5f297a50b8aa97bd7b39d3a (commit)


- Log -----------------------------------------------------------------
commit 56d909863dcff26e82ebb06d185668f00287f67b
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jul 20 21:22:31 2017 +0200

    Fix apps/s_client.c's XMPP client
    
    When an error occurs during the starttls handskake, s_client gets stuck
    looping around zero bytes reads, because the server won't sent anything more
    after its error tag.  Shutting down on the first zero byte read fixes this.
    
    Fixes #3980
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3981)

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

Summary of changes:
 apps/s_client.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/s_client.c b/apps/s_client.c
index 85c1b6b..dc46799 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1667,6 +1667,8 @@ int MAIN(int argc, char **argv)
             if (strstr(mbuf, "/stream:features>"))
                 goto shut;
             seen = BIO_read(sbio, mbuf, BUFSIZZ);
+            if (seen <= 0)
+                goto shut;
             mbuf[seen] = 0;
         }
         BIO_printf(sbio,