diff options
author | Brent Cook <busterb@gmail.com> | 2019-05-07 02:11:02 -0500 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2019-05-07 02:11:02 -0500 |
commit | 6e2215c465448b68f35943713c36252f039dd950 (patch) | |
tree | db7fa02a527db15a10d95a24c7a387c2db468a24 /patches/tlsexttest.c.patch | |
parent | 04aa7f71288b38a4ce18cf0789c52fab3a4e04c2 (diff) | |
download | portable-6e2215c465448b68f35943713c36252f039dd950.tar.gz portable-6e2215c465448b68f35943713c36252f039dd950.tar.bz2 portable-6e2215c465448b68f35943713c36252f039dd950.zip |
rebase patches
Diffstat (limited to 'patches/tlsexttest.c.patch')
-rw-r--r-- | patches/tlsexttest.c.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/patches/tlsexttest.c.patch b/patches/tlsexttest.c.patch index 23cbde8..ffb222b 100644 --- a/patches/tlsexttest.c.patch +++ b/patches/tlsexttest.c.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | --- tests/tlsexttest.c.orig Sat Feb 9 07:24:55 2019 | 1 | --- tests/tlsexttest.c.orig Thu Apr 11 06:27:40 2019 |
2 | +++ tests/tlsexttest.c Sat Feb 9 07:25:22 2019 | 2 | +++ tests/tlsexttest.c Tue May 7 02:07:40 2019 |
3 | @@ -1670,7 +1670,9 @@ | 3 | @@ -1654,7 +1654,9 @@ |
4 | }; | 4 | }; |
5 | 5 | ||
6 | static unsigned char tlsext_sni_server[] = { | 6 | static unsigned char tlsext_sni_server[] = { |
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | static int | 11 | static int |
12 | test_tlsext_sni_client(void) | 12 | test_tlsext_sni_client(void) |
13 | @@ -1833,9 +1835,9 @@ | 13 | @@ -1817,9 +1819,9 @@ |
14 | if (!CBB_finish(&cbb, &data, &dlen)) | 14 | if (!CBB_finish(&cbb, &data, &dlen)) |
15 | errx(1, "failed to finish CBB"); | 15 | errx(1, "failed to finish CBB"); |
16 | 16 | ||
@@ -22,7 +22,7 @@ | |||
22 | goto err; | 22 | goto err; |
23 | } | 23 | } |
24 | 24 | ||
25 | @@ -1844,14 +1846,14 @@ | 25 | @@ -1828,14 +1830,14 @@ |
26 | fprintf(stderr, "received:\n"); | 26 | fprintf(stderr, "received:\n"); |
27 | hexdump(data, dlen); | 27 | hexdump(data, dlen); |
28 | fprintf(stderr, "test data:\n"); | 28 | fprintf(stderr, "test data:\n"); |
@@ -39,7 +39,7 @@ | |||
39 | if (!tlsext_sni_client_parse(ssl, &cbs, &alert)) { | 39 | if (!tlsext_sni_client_parse(ssl, &cbs, &alert)) { |
40 | FAIL("failed to parse server SNI\n"); | 40 | FAIL("failed to parse server SNI\n"); |
41 | goto err; | 41 | goto err; |
42 | @@ -2735,7 +2737,10 @@ | 42 | @@ -2719,7 +2721,10 @@ |
43 | 0x02, 0x01, 0x02, 0x03, | 43 | 0x02, 0x01, 0x02, 0x03, |
44 | }; | 44 | }; |
45 | 45 | ||
@@ -51,7 +51,7 @@ | |||
51 | 51 | ||
52 | static int | 52 | static int |
53 | test_tlsext_clienthello_build(void) | 53 | test_tlsext_clienthello_build(void) |
54 | @@ -2800,18 +2805,18 @@ | 54 | @@ -2784,18 +2789,18 @@ |
55 | if (!CBB_finish(&cbb, &data, &dlen)) | 55 | if (!CBB_finish(&cbb, &data, &dlen)) |
56 | errx(1, "failed to finish CBB"); | 56 | errx(1, "failed to finish CBB"); |
57 | 57 | ||
@@ -74,7 +74,7 @@ | |||
74 | goto err; | 74 | goto err; |
75 | } | 75 | } |
76 | 76 | ||
77 | @@ -2826,7 +2831,10 @@ | 77 | @@ -2810,7 +2815,10 @@ |
78 | return (failure); | 78 | return (failure); |
79 | } | 79 | } |
80 | 80 | ||
@@ -86,7 +86,7 @@ | |||
86 | 86 | ||
87 | unsigned char tlsext_serverhello_enabled[] = { | 87 | unsigned char tlsext_serverhello_enabled[] = { |
88 | 0x00, 0x13, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00, | 88 | 0x00, 0x13, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00, |
89 | @@ -2866,18 +2874,18 @@ | 89 | @@ -2850,18 +2858,18 @@ |
90 | if (!CBB_finish(&cbb, &data, &dlen)) | 90 | if (!CBB_finish(&cbb, &data, &dlen)) |
91 | errx(1, "failed to finish CBB"); | 91 | errx(1, "failed to finish CBB"); |
92 | 92 | ||