diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2018-12-06 20:11:15 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2018-12-06 20:11:15 +0000 |
| commit | 409a482cecbacae673bade20e7a5d4ceed6db327 (patch) | |
| tree | 141fc52370da7fc21f8adc8e2596f66d3e415146 /net/hostapd/files | |
| parent | Security update to 11.5.3. (diff) | |
Update 2.6 --> 2.7
Diffstat (limited to 'net/hostapd/files')
| -rw-r--r-- | net/hostapd/files/patch-crypto__openssl.c | 30 | ||||
| -rw-r--r-- | net/hostapd/files/patch-src_common_dhcp.h | 25 | ||||
| -rw-r--r-- | net/hostapd/files/patch-src_crypto_tls__openssl.c | 11 |
3 files changed, 25 insertions, 41 deletions
diff --git a/net/hostapd/files/patch-crypto__openssl.c b/net/hostapd/files/patch-crypto__openssl.c deleted file mode 100644 index 213c648ed07c..000000000000 --- a/net/hostapd/files/patch-crypto__openssl.c +++ /dev/null @@ -1,30 +0,0 @@ ---- src/crypto/crypto_openssl.c.orig 2016-10-02 18:51:11 UTC -+++ src/crypto/crypto_openssl.c -@@ -33,7 +33,8 @@ - #include "aes_wrap.h" - #include "crypto.h" - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - /* Compatibility wrappers for older versions. */ - - static HMAC_CTX * HMAC_CTX_new(void) -@@ -611,7 +612,7 @@ void crypto_cipher_deinit(struct crypto_ - - void * dh5_init(struct wpabuf **priv, struct wpabuf **publ) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) - DH *dh; - struct wpabuf *pubkey = NULL, *privkey = NULL; - size_t publen, privlen; -@@ -712,7 +713,7 @@ err: - - void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - DH *dh; - - dh = DH_new(); diff --git a/net/hostapd/files/patch-src_common_dhcp.h b/net/hostapd/files/patch-src_common_dhcp.h new file mode 100644 index 000000000000..f88d1921a380 --- /dev/null +++ b/net/hostapd/files/patch-src_common_dhcp.h @@ -0,0 +1,25 @@ +--- src/common/dhcp.h.orig 2018-12-02 11:34:59.000000000 -0800 ++++ src/common/dhcp.h 2018-12-06 00:01:11.429254000 -0800 +@@ -9,6 +9,22 @@ + #ifndef DHCP_H + #define DHCP_H + ++/* ++ * Translate Linux to FreeBSD ++ */ ++#define iphdr ip ++#define ihl ip_hl ++#define verson ip_v ++#define tos ip_tos ++#define tot_len ip_len ++#define id ip_id ++#define frag_off ip_off ++#define ttl ip_ttl ++#define protocol ip_p ++#define check ip_sum ++#define saddr ip_src ++#define daddr ip_dst ++ + #include <netinet/ip.h> + #if __FAVOR_BSD + #include <netinet/udp.h> diff --git a/net/hostapd/files/patch-src_crypto_tls__openssl.c b/net/hostapd/files/patch-src_crypto_tls__openssl.c deleted file mode 100644 index 04f34b268584..000000000000 --- a/net/hostapd/files/patch-src_crypto_tls__openssl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/crypto/tls_openssl.c.orig 2016-10-02 18:51:11 UTC -+++ src/crypto/tls_openssl.c -@@ -59,7 +59,7 @@ typedef int stack_index_t; - #endif /* SSL_set_tlsext_status_type */ - - #if (OPENSSL_VERSION_NUMBER < 0x10100000L || \ -- defined(LIBRESSL_VERSION_NUMBER)) && \ -+ (defined(LIBRESSL_VERSION_NUMBER)) && LIBRESSL_VERSION_NUMBER < 0x20700000L) && \ - !defined(BORINGSSL_API_VERSION) - /* - * SSL_get_client_random() and SSL_get_server_random() were added in OpenSSL |