diff options
author | Theo Buehler <tb@openbsd.org> | 2023-07-05 11:32:18 -0600 |
---|---|---|
committer | Theo Buehler <tb@openbsd.org> | 2023-07-05 11:32:18 -0600 |
commit | 9a00e9e1ceb21d12f4c280ff29ff688991b994dd (patch) | |
tree | 02c5848d2dcdccfd3ca03f5508cdc23d29066fc6 /patches | |
parent | 186134f7c5578fe979fb8f18a96c84fe04e4413e (diff) | |
download | portable-9a00e9e1ceb21d12f4c280ff29ff688991b994dd.tar.gz portable-9a00e9e1ceb21d12f4c280ff29ff688991b994dd.tar.bz2 portable-9a00e9e1ceb21d12f4c280ff29ff688991b994dd.zip |
Remove patch that was merged into upstream
Diffstat (limited to 'patches')
-rw-r--r-- | patches/tlsexttest.c.patch | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/patches/tlsexttest.c.patch b/patches/tlsexttest.c.patch deleted file mode 100644 index 023d323..0000000 --- a/patches/tlsexttest.c.patch +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | --- tests/tlsexttest.c.orig Fri Apr 28 11:42:38 2023 | ||
2 | +++ tests/tlsexttest.c Fri Apr 28 11:55:27 2023 | ||
3 | @@ -1775,7 +1775,9 @@ | ||
4 | }; | ||
5 | |||
6 | static const unsigned char tlsext_sni_server[] = { | ||
7 | + 0x00 | ||
8 | }; | ||
9 | +const size_t sizeof_tlsext_sni_server = 0; | ||
10 | |||
11 | static int | ||
12 | test_tlsext_sni_client(void) | ||
13 | @@ -1973,9 +1975,9 @@ | ||
14 | if (!CBB_finish(&cbb, &data, &dlen)) | ||
15 | errx(1, "failed to finish CBB"); | ||
16 | |||
17 | - if (dlen != sizeof(tlsext_sni_server)) { | ||
18 | + if (dlen != sizeof_tlsext_sni_server) { | ||
19 | FAIL("got server SNI with length %zu, " | ||
20 | - "want length %zu\n", dlen, sizeof(tlsext_sni_server)); | ||
21 | + "want length %zu\n", dlen, sizeof_tlsext_sni_server); | ||
22 | goto err; | ||
23 | } | ||
24 | |||
25 | @@ -1984,14 +1986,14 @@ | ||
26 | fprintf(stderr, "received:\n"); | ||
27 | hexdump(data, dlen); | ||
28 | fprintf(stderr, "test data:\n"); | ||
29 | - hexdump(tlsext_sni_server, sizeof(tlsext_sni_server)); | ||
30 | + hexdump(tlsext_sni_server, sizeof_tlsext_sni_server); | ||
31 | goto err; | ||
32 | } | ||
33 | |||
34 | free(ssl->session->tlsext_hostname); | ||
35 | ssl->session->tlsext_hostname = NULL; | ||
36 | |||
37 | - CBS_init(&cbs, tlsext_sni_server, sizeof(tlsext_sni_server)); | ||
38 | + CBS_init(&cbs, tlsext_sni_server, sizeof_tlsext_sni_server); | ||
39 | if (!client_funcs->parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) { | ||
40 | FAIL("failed to parse server SNI\n"); | ||
41 | goto err; | ||
42 | @@ -3196,7 +3198,10 @@ | ||
43 | 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, | ||
44 | }; | ||
45 | |||
46 | -unsigned char tlsext_clienthello_disabled[] = {}; | ||
47 | +unsigned char tlsext_clienthello_disabled[] = { | ||
48 | + 0x00 | ||
49 | +}; | ||
50 | +const size_t sizeof_tlsext_clienthello_disabled = 0; | ||
51 | |||
52 | static int | ||
53 | test_tlsext_clienthello_build(void) | ||
54 | @@ -3287,18 +3292,18 @@ | ||
55 | goto err; | ||
56 | } | ||
57 | |||
58 | - if (dlen != sizeof(tlsext_clienthello_disabled)) { | ||
59 | + if (dlen != sizeof_tlsext_clienthello_disabled) { | ||
60 | FAIL("got clienthello extensions with length %zu, " | ||
61 | "want length %zu\n", dlen, | ||
62 | - sizeof(tlsext_clienthello_disabled)); | ||
63 | + sizeof_tlsext_clienthello_disabled); | ||
64 | compare_data(data, dlen, tlsext_clienthello_disabled, | ||
65 | - sizeof(tlsext_clienthello_disabled)); | ||
66 | + sizeof_tlsext_clienthello_disabled); | ||
67 | goto err; | ||
68 | } | ||
69 | if (memcmp(data, tlsext_clienthello_disabled, dlen) != 0) { | ||
70 | FAIL("clienthello extensions differs:\n"); | ||
71 | compare_data(data, dlen, tlsext_clienthello_disabled, | ||
72 | - sizeof(tlsext_clienthello_disabled)); | ||
73 | + sizeof_tlsext_clienthello_disabled); | ||
74 | goto err; | ||
75 | } | ||
76 | |||