| 1 |
diff --git a/apps/s_client.c b/apps/s_client.c |
| 2 |
index a0668bc927..a276332b20 100644 |
| 3 |
--- a/apps/s_client.c |
| 4 |
+++ b/apps/s_client.c |
| 5 |
@@ -2263,10 +2263,11 @@ int s_client_main(int argc, char **argv) |
| 6 |
(void)BIO_flush(fbio); |
| 7 |
BIO_pop(fbio); |
| 8 |
BIO_free(fbio); |
| 9 |
- if (!foundit) |
| 10 |
+ if (!foundit){ |
| 11 |
BIO_printf(bio_err, |
| 12 |
- "Didn't find STARTTLS in server response," |
| 13 |
- " trying anyway...\n"); |
| 14 |
+ "Didn't find STARTTLS in server response, shut1...\n"); |
| 15 |
+ goto shut; |
| 16 |
+ } |
| 17 |
BIO_printf(sbio, "STARTTLS\r\n"); |
| 18 |
BIO_read(sbio, sbuf, BUFSIZZ); |
| 19 |
} |
| 20 |
@@ -2302,10 +2303,11 @@ int s_client_main(int argc, char **argv) |
| 21 |
(void)BIO_flush(fbio); |
| 22 |
BIO_pop(fbio); |
| 23 |
BIO_free(fbio); |
| 24 |
- if (!foundit) |
| 25 |
+ if (!foundit){ |
| 26 |
BIO_printf(bio_err, |
| 27 |
- "Didn't find STARTTLS in server response," |
| 28 |
- " trying anyway...\n"); |
| 29 |
+ "Didn't find STARTTLS in server response, shut2...\n"); |
| 30 |
+ goto shut; |
| 31 |
+ } |
| 32 |
BIO_printf(sbio, ". STARTTLS\r\n"); |
| 33 |
BIO_read(sbio, sbuf, BUFSIZZ); |
| 34 |
} |
| 35 |
@@ -2659,10 +2661,11 @@ int s_client_main(int argc, char **argv) |
| 36 |
(void)BIO_flush(fbio); |
| 37 |
BIO_pop(fbio); |
| 38 |
BIO_free(fbio); |
| 39 |
- if (!foundit) |
| 40 |
+ if (!foundit){ |
| 41 |
BIO_printf(bio_err, |
| 42 |
- "Didn't find STARTTLS in server response," |
| 43 |
- " trying anyway...\n"); |
| 44 |
+ "Didn't find STARTTLS in server response, shut3...\n"); |
| 45 |
+ goto shut; |
| 46 |
+ } |
| 47 |
BIO_printf(sbio, "STARTTLS\r\n"); |
| 48 |
mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ); |
| 49 |
if (mbuf_len < 0) { |
| 50 |
@@ -2698,10 +2701,11 @@ int s_client_main(int argc, char **argv) |
| 51 |
(void)BIO_flush(fbio); |
| 52 |
BIO_pop(fbio); |
| 53 |
BIO_free(fbio); |
| 54 |
- if (!foundit) |
| 55 |
+ if (!foundit){ |
| 56 |
BIO_printf(bio_err, |
| 57 |
- "Didn't find STARTTLS in server response," |
| 58 |
- " trying anyway...\n"); |
| 59 |
+ "Didn't find STARTTLS in server response, shut4...\n"); |
| 60 |
+ goto shut; |
| 61 |
+ } |
| 62 |
BIO_printf(sbio, "STARTTLS\r\n"); |
| 63 |
mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ); |
| 64 |
if (mbuf_len < 0) { |
Parent Directory
Revision Log