[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  f997e456b9bd43af275aab90c727a52287467e98 (commit)
      from  df09b6b5f9088db10ef13dd71999db9b282b8d1a (commit)


- Log -----------------------------------------------------------------
commit f997e456b9bd43af275aab90c727a52287467e98
Author: Dan Campbell <dan at ws0w.com>
Date:   Thu Apr 4 15:15:33 2019 -0600

    s_client starttls: fix handling of multiline reply
    
    Fixes #8645
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8654)

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

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

diff --git a/apps/s_client.c b/apps/s_client.c
index bb4f0aa..282d137 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2277,7 +2277,7 @@ int s_client_main(int argc, char **argv)
             do {
                 mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
             }
-            while (mbuf_len > 3 && mbuf[3] == '-');
+            while (mbuf_len > 3 && (!isdigit(mbuf[0]) || !isdigit(mbuf[1]) || !isdigit(mbuf[2]) || mbuf[3] != ' '));
             (void)BIO_flush(fbio);
             BIO_pop(fbio);
             BIO_free(fbio);