rediff patches
This commit is contained in:
parent
1841e199ac
commit
a2ea649536
@ -1,9 +1,9 @@
|
|||||||
--- tests/aeadtest.c.orig 2018-07-24 21:59:17.000000000 -0500
|
--- tests/aeadtest.c.orig Sat Jan 26 12:39:05 2019
|
||||||
+++ tests/aeadtest.c 2018-11-07 18:44:43.000000000 -0600
|
+++ tests/aeadtest.c Fri Sep 4 04:04:26 2020
|
||||||
@@ -76,6 +76,12 @@
|
@@ -79,6 +79,12 @@
|
||||||
|
|
||||||
#define BUF_MAX 1024
|
#define BUF_MAX 1024
|
||||||
|
|
||||||
+#ifdef _MSC_VER
|
+#ifdef _MSC_VER
|
||||||
+#ifdef IN
|
+#ifdef IN
|
||||||
+#undef IN
|
+#undef IN
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- tests/handshake_table.c.orig Mon May 4 23:28:43 2020
|
--- tests/handshake_table.c.orig Sat Aug 22 18:51:52 2020
|
||||||
+++ tests/handshake_table.c Mon May 4 23:29:50 2020
|
+++ tests/handshake_table.c Fri Sep 4 04:04:26 2020
|
||||||
@@ -477,6 +477,7 @@
|
@@ -479,6 +479,7 @@
|
||||||
unsigned int depth = 0;
|
unsigned int depth = 0;
|
||||||
int ch, graphviz = 0, print = 0;
|
int ch, graphviz = 0, print = 0;
|
||||||
|
|
||||||
@ -8,7 +8,7 @@
|
|||||||
while ((ch = getopt(argc, argv, "Cg")) != -1) {
|
while ((ch = getopt(argc, argv, "Cg")) != -1) {
|
||||||
switch (ch) {
|
switch (ch) {
|
||||||
case 'C':
|
case 'C':
|
||||||
@@ -494,6 +495,7 @@
|
@@ -496,6 +497,7 @@
|
||||||
|
|
||||||
if (argc != 0)
|
if (argc != 0)
|
||||||
usage();
|
usage();
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- apps/openssl/openssl.c.orig Fri Dec 14 01:44:33 2018
|
--- apps/openssl/openssl.c.orig Thu Nov 7 18:19:01 2019
|
||||||
+++ apps/openssl/openssl.c Sat Jan 19 22:19:23 2019
|
+++ apps/openssl/openssl.c Fri Sep 4 04:04:26 2020
|
||||||
@@ -350,7 +350,9 @@
|
@@ -360,7 +360,9 @@
|
||||||
static void
|
static void
|
||||||
openssl_startup(void)
|
openssl_startup(void)
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- tests/tlsexttest.c.orig Mon Jul 6 03:17:51 2020
|
--- tests/tlsexttest.c.orig Sat Aug 22 18:51:52 2020
|
||||||
+++ tests/tlsexttest.c Mon Jul 6 03:45:00 2020
|
+++ tests/tlsexttest.c Fri Sep 4 04:04:26 2020
|
||||||
@@ -1657,7 +1657,9 @@
|
@@ -1658,7 +1658,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)
|
||||||
@@ -1820,9 +1822,9 @@
|
@@ -1821,9 +1823,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1831,14 +1833,14 @@
|
@@ -1832,14 +1834,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,8 +39,8 @@
|
|||||||
if (!tlsext_sni_client_parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) {
|
if (!tlsext_sni_client_parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) {
|
||||||
FAIL("failed to parse server SNI\n");
|
FAIL("failed to parse server SNI\n");
|
||||||
goto err;
|
goto err;
|
||||||
@@ -2722,7 +2724,10 @@
|
@@ -2723,7 +2725,10 @@
|
||||||
0x02, 0x01, 0x02, 0x03,
|
0x04, 0x03, 0x02, 0x01, 0x02, 0x03,
|
||||||
};
|
};
|
||||||
|
|
||||||
-unsigned char tlsext_clienthello_disabled[] = {};
|
-unsigned char tlsext_clienthello_disabled[] = {};
|
||||||
@ -51,7 +51,7 @@
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
test_tlsext_clienthello_build(void)
|
test_tlsext_clienthello_build(void)
|
||||||
@@ -2787,18 +2792,18 @@
|
@@ -2788,18 +2793,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");
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user