From 5ec2c381e4ac48e588a093be5faf04919523da32 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 17 Jul 2017 06:13:21 -0500 Subject: [PATCH] rebase patches on latest, remove fuzz --- patches/netcat.c.patch | 28 ++++++++++++++-------------- patches/tls_internal.h.patch | 10 +++++----- patches/windows_headers.patch | 19 +++++++++---------- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/patches/netcat.c.patch b/patches/netcat.c.patch index 7160d4c..7ba6b5f 100644 --- a/patches/netcat.c.patch +++ b/patches/netcat.c.patch @@ -1,5 +1,5 @@ ---- apps/nc/netcat.c.orig 2017-07-07 00:10:09.009409624 +0900 -+++ apps/nc/netcat.c 2017-07-07 00:30:32.380088772 +0900 +--- apps/nc/netcat.c.orig Mon Jul 17 06:06:51 2017 ++++ apps/nc/netcat.c Mon Jul 17 06:11:24 2017 @@ -66,7 +66,9 @@ #define POLL_NETIN 2 #define POLL_STDOUT 3 @@ -10,7 +10,7 @@ #define TLS_ALL (1 << 1) #define TLS_NOVERIFY (1 << 2) -@@ -94,9 +96,13 @@ int zflag; /* Port Scan Flag */ +@@ -95,9 +97,13 @@ int Dflag; /* sodebug */ int Iflag; /* TCP receive buffer size */ int Oflag; /* TCP send buffer size */ @@ -24,7 +24,7 @@ int usetls; /* use TLS */ char *Cflag; /* Public cert file */ -@@ -265,12 +271,14 @@ main(int argc, char *argv[]) +@@ -266,12 +272,14 @@ case 'u': uflag = 1; break; @@ -39,7 +39,7 @@ case 'v': vflag = 1; break; -@@ -317,9 +325,11 @@ main(int argc, char *argv[]) +@@ -318,9 +326,11 @@ case 'o': oflag = optarg; break; @@ -51,7 +51,7 @@ case 'T': errstr = NULL; errno = 0; -@@ -343,9 +353,11 @@ main(int argc, char *argv[]) +@@ -344,9 +354,11 @@ argc -= optind; argv += optind; @@ -63,7 +63,7 @@ if (family == AF_UNIX) { if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1) -@@ -888,7 +900,10 @@ int +@@ -892,7 +904,10 @@ remote_connect(const char *host, const char *port, struct addrinfo hints) { struct addrinfo *res, *res0; @@ -75,7 +75,7 @@ if ((error = getaddrinfo(host, port, &hints, &res0))) errx(1, "getaddrinfo for host \"%s\" port %s: %s", host, -@@ -903,8 +918,10 @@ remote_connect(const char *host, const c +@@ -907,8 +922,10 @@ if (sflag || pflag) { struct addrinfo ahints, *ares; @@ -86,7 +86,7 @@ memset(&ahints, 0, sizeof(struct addrinfo)); ahints.ai_family = res->ai_family; ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; -@@ -975,7 +992,10 @@ int +@@ -979,7 +996,10 @@ local_listen(char *host, char *port, struct addrinfo hints) { struct addrinfo *res, *res0; @@ -98,7 +98,7 @@ int error; /* Allow nodename to be null. */ -@@ -996,9 +1016,11 @@ local_listen(char *host, char *port, str +@@ -1000,9 +1020,11 @@ res->ai_protocol)) < 0) continue; @@ -110,7 +110,7 @@ set_common_sockopts(s, res->ai_family); -@@ -1454,11 +1476,13 @@ set_common_sockopts(int s, int af) +@@ -1458,11 +1480,13 @@ { int x = 1; @@ -124,7 +124,7 @@ if (Dflag) { if (setsockopt(s, SOL_SOCKET, SO_DEBUG, &x, sizeof(x)) == -1) -@@ -1469,9 +1493,16 @@ set_common_sockopts(int s, int af) +@@ -1473,9 +1497,16 @@ IP_TOS, &Tflag, sizeof(Tflag)) == -1) err(1, "set IP ToS"); @@ -141,7 +141,7 @@ } if (Iflag) { if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, -@@ -1495,13 +1526,17 @@ set_common_sockopts(int s, int af) +@@ -1499,13 +1530,17 @@ } if (minttl != -1) { @@ -160,7 +160,7 @@ } } -@@ -1709,14 +1744,22 @@ help(void) +@@ -1714,14 +1749,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\ diff --git a/patches/tls_internal.h.patch b/patches/tls_internal.h.patch index 0f50827..e82bf96 100644 --- a/patches/tls_internal.h.patch +++ b/patches/tls_internal.h.patch @@ -1,12 +1,12 @@ ---- ./openbsd/src/lib/libtls/tls_internal.h Thu Oct 15 16:12:24 2015 -+++ ./tls/tls_internal.h Sun Dec 6 20:18:17 2015 -@@ -24,7 +24,9 @@ +--- tls/tls_internal.h.orig Sun Jul 9 06:16:17 2017 ++++ tls/tls_internal.h Mon Jul 17 06:10:01 2017 +@@ -26,7 +26,9 @@ - #include + __BEGIN_HIDDEN_DECLS +#ifndef _PATH_SSL_CA_FILE #define _PATH_SSL_CA_FILE "/etc/ssl/cert.pem" +#endif - #define TLS_CIPHERS_COMPAT "ALL:!aNULL:!eNULL" #define TLS_CIPHERS_DEFAULT "TLSv1.2+AEAD+ECDHE:TLSv1.2+AEAD+DHE" + #define TLS_CIPHERS_COMPAT "HIGH:!aNULL" diff --git a/patches/windows_headers.patch b/patches/windows_headers.patch index e8b4022..5d216fb 100644 --- a/patches/windows_headers.patch +++ b/patches/windows_headers.patch @@ -4,36 +4,35 @@ diff -u include/openssl.orig/dtls1.h include/openssl/dtls1.h @@ -60,7 +60,11 @@ #ifndef HEADER_DTLS1_H #define HEADER_DTLS1_H - + +#if defined(_WIN32) +#include +#else #include +#endif - + #include #include -diff -u include/openssl.orig/opensslconf.h include/openssl/opensslconf.h ---- include/openssl.orig/opensslconf.h Mon Dec 7 07:58:32 2015 -+++ include/openssl/opensslconf.h Mon Dec 7 07:56:14 2015 +--- include/openssl/opensslconf.h.orig Sat Nov 5 08:36:25 2016 ++++ include/openssl/opensslconf.h Mon Jul 17 06:06:58 2017 @@ -1,6 +1,10 @@ #include /* crypto/opensslconf.h.in */ - + +#if defined(_MSC_VER) && !defined(__attribute__) +#define __attribute__(a) +#endif + #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" - + #endif diff -u include/openssl.orig/ossl_typ.h include/openssl/ossl_typ.h --- include/openssl.orig/ossl_typ.h Mon Dec 7 07:58:32 2015 +++ include/openssl/ossl_typ.h Mon Dec 7 07:56:14 2015 @@ -80,6 +80,22 @@ typedef struct ASN1_ITEM_st ASN1_ITEM; typedef struct asn1_pctx_st ASN1_PCTX; - + +#if defined(_WIN32) && defined(__WINCRYPT_H__) +#ifndef LIBRESSL_INTERNAL +#ifdef _MSC_VER @@ -59,7 +58,7 @@ diff -u include/openssl.orig/pkcs7.h include/openssl/pkcs7.h @@ -69,6 +69,18 @@ extern "C" { #endif - + +#if defined(_WIN32) && defined(__WINCRYPT_H__) +#ifndef LIBRESSL_INTERNAL +#ifdef _MSC_VER @@ -81,7 +80,7 @@ diff -u include/openssl.orig/x509.h include/openssl/x509.h @@ -112,6 +112,19 @@ extern "C" { #endif - + +#if defined(_WIN32) +#ifndef LIBRESSL_INTERNAL +#ifdef _MSC_VER