that was bad.
@@ -1,42 +1,62 @@ | ||
1 | ---- apps/s_client.c.orig 2019-12-23 08:34:23.445693055 +0300 | |
2 | -+++ apps/s_client.c 2019-12-23 08:41:59.195713565 +0300 | |
3 | -@@ -2266,7 +2266,8 @@ | |
4 | - if (!foundit) | |
1 | +--- apps/s_client.c.orig 2019-12-23 12:27:42.604323060 +0300 | |
2 | ++++ apps/s_client.c 2019-12-23 12:35:53.946345172 +0300 | |
3 | +@@ -2263,11 +2263,11 @@ | |
4 | + (void)BIO_flush(fbio); | |
5 | + BIO_pop(fbio); | |
6 | + BIO_free(fbio); | |
7 | +- if (!foundit) | |
8 | ++ if (!foundit){ | |
5 | 9 | BIO_printf(bio_err, |
6 | - "Didn't find STARTTLS in server response," | |
7 | -- " trying anyway...\n"); | |
8 | -+ " shut1...\n"); | |
9 | -+ goto shut; | |
10 | +- "Didn't find STARTTLS in server response," | |
11 | +- " shut1...\n"); | |
12 | ++ "Didn't find STARTTLS in server response, shut1...\n"); | |
13 | + goto shut; | |
14 | ++ } | |
10 | 15 | BIO_printf(sbio, "STARTTLS\r\n"); |
11 | 16 | BIO_read(sbio, sbuf, BUFSIZZ); |
12 | 17 | } |
13 | -@@ -2305,7 +2306,8 @@ | |
14 | - if (!foundit) | |
18 | +@@ -2303,11 +2303,11 @@ | |
19 | + (void)BIO_flush(fbio); | |
20 | + BIO_pop(fbio); | |
21 | + BIO_free(fbio); | |
22 | +- if (!foundit) | |
23 | ++ if (!foundit){ | |
15 | 24 | BIO_printf(bio_err, |
16 | - "Didn't find STARTTLS in server response," | |
17 | -- " trying anyway...\n"); | |
18 | -+ " shut2...\n"); | |
19 | -+ goto shut; | |
25 | +- "Didn't find STARTTLS in server response," | |
26 | +- " shut2...\n"); | |
27 | ++ "Didn't find STARTTLS in server response, shut2...\n"); | |
28 | + goto shut; | |
29 | ++ } | |
20 | 30 | BIO_printf(sbio, ". STARTTLS\r\n"); |
21 | 31 | BIO_read(sbio, sbuf, BUFSIZZ); |
22 | 32 | } |
23 | -@@ -2662,7 +2664,8 @@ | |
24 | - if (!foundit) | |
33 | +@@ -2661,11 +2661,11 @@ | |
34 | + (void)BIO_flush(fbio); | |
35 | + BIO_pop(fbio); | |
36 | + BIO_free(fbio); | |
37 | +- if (!foundit) | |
38 | ++ if (!foundit){ | |
25 | 39 | BIO_printf(bio_err, |
26 | - "Didn't find STARTTLS in server response," | |
27 | -- " trying anyway...\n"); | |
28 | -+ " shut3...\n"); | |
29 | -+ goto shut; | |
40 | +- "Didn't find STARTTLS in server response," | |
41 | +- " shut3...\n"); | |
42 | ++ "Didn't find STARTTLS in server response, shut3...\n"); | |
43 | + goto shut; | |
44 | ++ } | |
30 | 45 | BIO_printf(sbio, "STARTTLS\r\n"); |
31 | 46 | mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ); |
32 | 47 | if (mbuf_len < 0) { |
33 | -@@ -2701,7 +2704,8 @@ | |
34 | - if (!foundit) | |
48 | +@@ -2701,11 +2701,11 @@ | |
49 | + (void)BIO_flush(fbio); | |
50 | + BIO_pop(fbio); | |
51 | + BIO_free(fbio); | |
52 | +- if (!foundit) | |
53 | ++ if (!foundit){ | |
35 | 54 | BIO_printf(bio_err, |
36 | - "Didn't find STARTTLS in server response," | |
37 | -- " trying anyway...\n"); | |
38 | -+ " shut4...\n"); | |
39 | -+ goto shut; | |
55 | +- "Didn't find STARTTLS in server response," | |
56 | +- " shut4...\n"); | |
57 | ++ "Didn't find STARTTLS in server response, shut4...\n"); | |
58 | + goto shut; | |
59 | ++ } | |
40 | 60 | BIO_printf(sbio, "STARTTLS\r\n"); |
41 | 61 | mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ); |
42 | 62 | if (mbuf_len < 0) { |