diff options
| author | Robert Scheck <robert@fedoraproject.org> | 2017-02-14 21:47:25 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-02-15 20:28:44 -0500 |
| commit | af7e05c7c60b87723efccc01f6d03ebc07cdd93c (patch) | |
| tree | c4d2d447d1aa61615230e6637f8b76bdb523f155 /apps/s_client.c | |
| parent | a8f957686675194d786b41f6e1f7c48bb85723ec (diff) | |
Handle negative reply for NNTP STARTTLS in s_client
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2629)
Diffstat (limited to 'apps/s_client.c')
| -rw-r--r-- | apps/s_client.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 6d960128f5..2db985daf3 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -2218,7 +2218,16 @@ int s_client_main(int argc, char **argv) "Didn't find STARTTLS in server response," " trying anyway...\n"); BIO_printf(sbio, "STARTTLS\r\n"); - BIO_read(sbio, sbuf, BUFSIZZ); + mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ); + if (mbuf_len < 0) { + BIO_printf(bio_err, "BIO_read failed\n"); + goto end; + } + mbuf[mbuf_len] = '\0'; + if (strstr(mbuf, "382") == NULL) { + BIO_printf(bio_err, "STARTTLS failed: %s", mbuf); + goto shut; + } } break; case PROTO_SIEVE: @@ -2252,15 +2261,16 @@ int s_client_main(int argc, char **argv) if (mbuf_len < 0) { BIO_printf(bio_err, "BIO_read failed\n"); goto end; - } else if (mbuf_len < 2) { - BIO_printf(bio_err, "Server does not support STARTTLS.\n"); + } + mbuf[mbuf_len] = '\0'; + if (mbuf_len < 2) { + BIO_printf(bio_err, "STARTTLS failed: %s", mbuf); goto shut; } /* * According to RFC 5804 ยง 2.2, response codes are case- * insensitive, make it uppercase but preserve the response. */ - mbuf[mbuf_len] = '\0'; strncpy(sbuf, mbuf, 2); make_uppercase(sbuf); if (strncmp(sbuf, "OK", 2) != 0) { |