factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix patch for tests/tlsexttest.c

Browse Source
This commit is contained in:
kinichiro 2020-05-12 20:21:18 +09:00
parent 740488d89e
commit 3b5ae00b00
1 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
patches/tlsexttest.c.patch
View File

@ -1,6 +1,6 @@
--- tests/tlsexttest.c.orig Sat Feb 15 11:04:42 2020 --- tests/tlsexttest.c.orig Tue May 12 20:06:02 2020
+++ tests/tlsexttest.c Sat Feb 15 11:25:30 2020 +++ tests/tlsexttest.c Tue May 12 20:15:28 2020
@@ -1656,7 +1656,9 @@ @@ -1657,7 +1657,9 @@
}; };
static unsigned char tlsext_sni_server[] = { static unsigned char tlsext_sni_server[] = {
@ -10,7 +10,7 @@
static int static int
test_tlsext_sni_client(void) test_tlsext_sni_client(void)
@@ -1819,9 +1821,9 @@ @@ -1820,9 +1822,9 @@
if (!CBB_finish(&cbb, &data, &dlen)) if (!CBB_finish(&cbb, &data, &dlen))
errx(1, "failed to finish CBB"); errx(1, "failed to finish CBB");
@ -22,7 +22,7 @@
goto err; goto err;
} }
@@ -1830,14 +1832,14 @@ @@ -1831,14 +1833,14 @@
fprintf(stderr, "received:\n"); fprintf(stderr, "received:\n");
hexdump(data, dlen); hexdump(data, dlen);
fprintf(stderr, "test data:\n"); fprintf(stderr, "test data:\n");
@ -39,7 +39,7 @@
if (!tlsext_sni_client_parse(ssl, &cbs, &alert)) { if (!tlsext_sni_client_parse(ssl, &cbs, &alert)) {
FAIL("failed to parse server SNI\n"); FAIL("failed to parse server SNI\n");
goto err; goto err;
@@ -2721,7 +2723,10 @@ @@ -2722,7 +2724,10 @@
0x02, 0x01, 0x02, 0x03, 0x02, 0x01, 0x02, 0x03,
}; };
@ -51,7 +51,7 @@
static int static int
test_tlsext_clienthello_build(void) test_tlsext_clienthello_build(void)
@@ -2786,18 +2791,18 @@ @@ -2787,18 +2792,18 @@
if (!CBB_finish(&cbb, &data, &dlen)) if (!CBB_finish(&cbb, &data, &dlen))
errx(1, "failed to finish CBB"); errx(1, "failed to finish CBB");
@ -74,38 +74,3 @@
goto err; goto err;
} }
@@ -2812,7 +2817,10 @@
return (failure);
}
-unsigned char tlsext_serverhello_default[] = {};
+unsigned char tlsext_serverhello_default[] = {
+ 0x00
+};
+const size_t sizeof_tlsext_serverhello_default = 0;
unsigned char tlsext_serverhello_enabled[] = {
0x00, 0x13, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00,
@@ -2852,18 +2860,18 @@
if (!CBB_finish(&cbb, &data, &dlen))
errx(1, "failed to finish CBB");
- if (dlen != sizeof(tlsext_serverhello_default)) {
+ if (dlen != sizeof_tlsext_serverhello_default) {
FAIL("got serverhello extensions with length %zu, "
"want length %zu\n", dlen,
- sizeof(tlsext_serverhello_default));
+ sizeof_tlsext_serverhello_default);
compare_data(data, dlen, tlsext_serverhello_default,
- sizeof(tlsext_serverhello_default));
+ sizeof_tlsext_serverhello_default);
goto err;
}
if (memcmp(data, tlsext_serverhello_default, dlen) != 0) {
FAIL("serverhello extensions differs:\n");
compare_data(data, dlen, tlsext_serverhello_default,
- sizeof(tlsext_serverhello_default));
+ sizeof_tlsext_serverhello_default);
goto err;
}