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

rebase patches

Browse Source
This commit is contained in:
Brent Cook 2019-05-07 02:11:02 -05:00
parent 04aa7f7128
commit 6e2215c465
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/netcat.c.patch
View File

@ -1,5 +1,5 @@
--- apps/nc/netcat.c.orig Fri Jan 18 15:41:52 2019
+++ apps/nc/netcat.c Sat Jan 19 22:19:23 2019
--- apps/nc/netcat.c.orig Tue Mar 19 05:24:51 2019
+++ apps/nc/netcat.c Tue May 7 02:07:40 2019
@@ -93,9 +93,13 @@
int Dflag; /* sodebug */
int Iflag; /* TCP receive buffer size */
@ -100,7 +100,7 @@
set_common_sockopts(s, res->ai_family);
@@ -1494,11 +1514,13 @@
@@ -1498,11 +1518,13 @@
{
int x = 1;
@ -114,7 +114,7 @@
if (Dflag) {
if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
&x, sizeof(x)) == -1)
@@ -1509,9 +1531,16 @@
@@ -1513,9 +1535,16 @@
IP_TOS, &Tflag, sizeof(Tflag)) == -1)
err(1, "set IP ToS");
@ -131,7 +131,7 @@
}
if (Iflag) {
if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
@@ -1535,13 +1564,17 @@
@@ -1539,13 +1568,17 @@
}
if (minttl != -1) {
@ -150,7 +150,7 @@
}
}
@@ -1763,14 +1796,22 @@
@@ -1767,14 +1800,22 @@
\t-P proxyuser\tUsername for proxy authentication\n\
\t-p port\t Specify local port for remote connects\n\
\t-R CAfile CA bundle\n\

18
patches/tlsexttest.c.patch
View File

@ -1,6 +1,6 @@
--- tests/tlsexttest.c.orig Sat Feb 9 07:24:55 2019
+++ tests/tlsexttest.c Sat Feb 9 07:25:22 2019
@@ -1670,7 +1670,9 @@
--- 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 @@
};
static unsigned char tlsext_sni_server[] = {
@ -10,7 +10,7 @@
static int
test_tlsext_sni_client(void)
@@ -1833,9 +1835,9 @@
@@ -1817,9 +1819,9 @@
if (!CBB_finish(&cbb, &data, &dlen))
errx(1, "failed to finish CBB");
@ -22,7 +22,7 @@
goto err;
}
@@ -1844,14 +1846,14 @@
@@ -1828,14 +1830,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;
@@ -2735,7 +2737,10 @@
@@ -2719,7 +2721,10 @@
0x02, 0x01, 0x02, 0x03,
};
@ -51,7 +51,7 @@
static int
test_tlsext_clienthello_build(void)
@@ -2800,18 +2805,18 @@
@@ -2784,18 +2789,18 @@
if (!CBB_finish(&cbb, &data, &dlen))
errx(1, "failed to finish CBB");
@ -74,7 +74,7 @@
goto err;
}
@@ -2826,7 +2831,10 @@
@@ -2810,7 +2815,10 @@
return (failure);
}
@ -86,7 +86,7 @@
unsigned char tlsext_serverhello_enabled[] = {
0x00, 0x13, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00,
@@ -2866,18 +2874,18 @@
@@ -2850,18 +2858,18 @@
if (!CBB_finish(&cbb, &data, &dlen))
errx(1, "failed to finish CBB");