rebase patches

This commit is contained in:
Brent Cook
2020-02-15 11:32:11 -06:00
parent 7f3bfc8922
commit 14dd93c37a
2 changed files with 26 additions and 27 deletions

View File

@@ -1,6 +1,6 @@
--- tests/tlsexttest.c.orig Thu Apr 11 06:27:40 2019
+++ tests/tlsexttest.c Tue May 7 02:07:40 2019
@@ -1654,7 +1654,9 @@
--- tests/tlsexttest.c.orig Sat Feb 15 11:04:42 2020
+++ tests/tlsexttest.c Sat Feb 15 11:25:30 2020
@@ -1656,7 +1656,9 @@
};
static unsigned char tlsext_sni_server[] = {
@@ -10,7 +10,7 @@
static int
test_tlsext_sni_client(void)
@@ -1817,9 +1819,9 @@
@@ -1819,9 +1821,9 @@
if (!CBB_finish(&cbb, &data, &dlen))
errx(1, "failed to finish CBB");
@@ -22,7 +22,7 @@
goto err;
}
@@ -1828,14 +1830,14 @@
@@ -1830,14 +1832,14 @@
fprintf(stderr, "received:\n");
hexdump(data, dlen);
fprintf(stderr, "test data:\n");
@@ -39,7 +39,7 @@
if (!tlsext_sni_client_parse(ssl, &cbs, &alert)) {
FAIL("failed to parse server SNI\n");
goto err;
@@ -2719,7 +2721,10 @@
@@ -2721,7 +2723,10 @@
0x02, 0x01, 0x02, 0x03,
};
@@ -51,7 +51,7 @@
static int
test_tlsext_clienthello_build(void)
@@ -2784,18 +2789,18 @@
@@ -2786,18 +2791,18 @@
if (!CBB_finish(&cbb, &data, &dlen))
errx(1, "failed to finish CBB");
@@ -74,7 +74,7 @@
goto err;
}
@@ -2810,7 +2815,10 @@
@@ -2812,7 +2817,10 @@
return (failure);
}
@@ -86,7 +86,7 @@
unsigned char tlsext_serverhello_enabled[] = {
0x00, 0x13, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00,
@@ -2850,18 +2858,18 @@
@@ -2852,18 +2860,18 @@
if (!CBB_finish(&cbb, &data, &dlen))
errx(1, "failed to finish CBB");