aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2020-09-04 04:12:49 -0500
committerBrent Cook <busterb@gmail.com>2020-09-04 04:12:49 -0500
commita2ea6495367de4b8bf5f3de125777280e5242a68 (patch)
tree2db796264388b5248b014e8863137c89f634019e
parent1841e199acdb398cbaf4748bc1a6eda4846cebe0 (diff)
downloadportable-a2ea6495367de4b8bf5f3de125777280e5242a68.tar.gz
portable-a2ea6495367de4b8bf5f3de125777280e5242a68.tar.bz2
portable-a2ea6495367de4b8bf5f3de125777280e5242a68.zip
rediff patches
-rw-r--r--patches/aeadtest.c.patch10
-rw-r--r--patches/handshake_table.c.patch8
-rw-r--r--patches/openssl.c.patch6
-rw-r--r--patches/tlsexttest.c.patch16
4 files changed, 20 insertions, 20 deletions
diff --git a/patches/aeadtest.c.patch b/patches/aeadtest.c.patch
index a7b3fca..4f7319d 100644
--- a/patches/aeadtest.c.patch
+++ b/patches/aeadtest.c.patch
@@ -1,9 +1,9 @@
1--- tests/aeadtest.c.orig 2018-07-24 21:59:17.000000000 -0500 1--- tests/aeadtest.c.orig Sat Jan 26 12:39:05 2019
2+++ tests/aeadtest.c 2018-11-07 18:44:43.000000000 -0600 2+++ tests/aeadtest.c Fri Sep 4 04:04:26 2020
3@@ -76,6 +76,12 @@ 3@@ -79,6 +79,12 @@
4 4
5 #define BUF_MAX 1024 5 #define BUF_MAX 1024
6 6
7+#ifdef _MSC_VER 7+#ifdef _MSC_VER
8+#ifdef IN 8+#ifdef IN
9+#undef IN 9+#undef IN
diff --git a/patches/handshake_table.c.patch b/patches/handshake_table.c.patch
index 46f2adb..b0a9f5b 100644
--- a/patches/handshake_table.c.patch
+++ b/patches/handshake_table.c.patch
@@ -1,6 +1,6 @@
1--- tests/handshake_table.c.orig Mon May 4 23:28:43 2020 1--- tests/handshake_table.c.orig Sat Aug 22 18:51:52 2020
2+++ tests/handshake_table.c Mon May 4 23:29:50 2020 2+++ tests/handshake_table.c Fri Sep 4 04:04:26 2020
3@@ -477,6 +477,7 @@ 3@@ -479,6 +479,7 @@
4 unsigned int depth = 0; 4 unsigned int depth = 0;
5 int ch, graphviz = 0, print = 0; 5 int ch, graphviz = 0, print = 0;
6 6
@@ -8,7 +8,7 @@
8 while ((ch = getopt(argc, argv, "Cg")) != -1) { 8 while ((ch = getopt(argc, argv, "Cg")) != -1) {
9 switch (ch) { 9 switch (ch) {
10 case 'C': 10 case 'C':
11@@ -494,6 +495,7 @@ 11@@ -496,6 +497,7 @@
12 12
13 if (argc != 0) 13 if (argc != 0)
14 usage(); 14 usage();
diff --git a/patches/openssl.c.patch b/patches/openssl.c.patch
index c41f25b..2c2a3da 100644
--- a/patches/openssl.c.patch
+++ b/patches/openssl.c.patch
@@ -1,6 +1,6 @@
1--- apps/openssl/openssl.c.orig Fri Dec 14 01:44:33 2018 1--- apps/openssl/openssl.c.orig Thu Nov 7 18:19:01 2019
2+++ apps/openssl/openssl.c Sat Jan 19 22:19:23 2019 2+++ apps/openssl/openssl.c Fri Sep 4 04:04:26 2020
3@@ -350,7 +350,9 @@ 3@@ -360,7 +360,9 @@
4 static void 4 static void
5 openssl_startup(void) 5 openssl_startup(void)
6 { 6 {
diff --git a/patches/tlsexttest.c.patch b/patches/tlsexttest.c.patch
index 35092c5..70a7efb 100644
--- a/patches/tlsexttest.c.patch
+++ b/patches/tlsexttest.c.patch
@@ -1,6 +1,6 @@
1--- tests/tlsexttest.c.orig Mon Jul 6 03:17:51 2020 1--- tests/tlsexttest.c.orig Sat Aug 22 18:51:52 2020
2+++ tests/tlsexttest.c Mon Jul 6 03:45:00 2020 2+++ tests/tlsexttest.c Fri Sep 4 04:04:26 2020
3@@ -1657,7 +1657,9 @@ 3@@ -1658,7 +1658,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@@ -1820,9 +1822,9 @@ 13@@ -1821,9 +1823,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@@ -1831,14 +1833,14 @@ 25@@ -1832,14 +1834,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,8 +39,8 @@
39 if (!tlsext_sni_client_parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) { 39 if (!tlsext_sni_client_parse(ssl, SSL_TLSEXT_MSG_SH, &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@@ -2722,7 +2724,10 @@ 42@@ -2723,7 +2725,10 @@
43 0x02, 0x01, 0x02, 0x03, 43 0x04, 0x03, 0x02, 0x01, 0x02, 0x03,
44 }; 44 };
45 45
46-unsigned char tlsext_clienthello_disabled[] = {}; 46-unsigned char tlsext_clienthello_disabled[] = {};
@@ -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@@ -2787,18 +2792,18 @@ 54@@ -2788,18 +2793,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