summaryrefslogtreecommitdiffstats
path: root/apps/s_client.c
diff options
context:
space:
mode:
authorDan Campbell <dan@ws0w.com>2019-04-04 15:15:33 -0600
committerPauli <paul.dale@oracle.com>2019-04-08 11:02:40 +1000
commitf997e456b9bd43af275aab90c727a52287467e98 (patch)
tree9a866fb452decdb62c4cb7377c190cc405848467 /apps/s_client.c
parentdf09b6b5f9088db10ef13dd71999db9b282b8d1a (diff)
s_client starttls: fix handling of multiline reply
Fixes #8645 Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8654)
Diffstat (limited to 'apps/s_client.c')
-rw-r--r--apps/s_client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/s_client.c b/apps/s_client.c
index bb4f0aab16..282d137b58 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);