diff options
| author | Michael Forney <mforney@mforney.org> | 2016-10-12 18:22:11 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-10-12 20:34:00 -0700 |
| commit | 055b0502f15be3a21c851d3a9e2baaa03452f214 (patch) | |
| tree | 5e6a60a740e058e7458131c40319199755edc835 | |
| parent | 9e24a744f0b596c83d184880698b21a4b04831e3 (diff) | |
hostap: Update to 2.6
| -rw-r--r-- | .gitmodules | 1 | ||||
| -rw-r--r-- | extra/hostap/config.h | 1 | ||||
| -rw-r--r-- | extra/hostap/gen.rc | 3 | ||||
| -rw-r--r-- | extra/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch | 38 | ||||
| -rw-r--r-- | extra/hostap/rev | 2 | ||||
| m--------- | extra/hostap/src | 0 |
6 files changed, 43 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index ddfca128..2b46bfa0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -116,6 +116,7 @@ [submodule "extra/hostap/src"] path = extra/hostap/src url = git://w1.fi/hostap.git + ignore = all [submodule "extra/libevent/src"] path = extra/libevent/src url = https://github.com/libevent/libevent diff --git a/extra/hostap/config.h b/extra/hostap/config.h index 8e486706..75c66698 100644 --- a/extra/hostap/config.h +++ b/extra/hostap/config.h @@ -10,6 +10,7 @@ #define CONFIG_NO_CONFIG_BLOBS #define CONFIG_NO_CONFIG_WRITE #define CONFIG_NO_RADIUS +#define CONFIG_NO_VLAN #define CONFIG_PEERKEY #define CONFIG_SHA256 #define CONFIG_SME diff --git a/extra/hostap/gen.rc b/extra/hostap/gen.rc index 5464f8d7..0ca0cdbb 100644 --- a/extra/hostap/gen.rc +++ b/extra/hostap/gen.rc @@ -17,6 +17,7 @@ exe bin/wpa_supplicant -d $"deps\ peerkey_auth.c\ )\ src/common/^(\ + ctrl_iface_common.c\ hw_features_common.c\ ieee802_11_common.c\ wpa_common.c\ @@ -78,7 +79,7 @@ exe bin/wpa_supplicant -d $"deps\ file bin/wpa_supplicant '$outdir'/bin/wpa_supplicant 755 exe bin/wpa_cli -d $"deps\ - src/common/wpa_ctrl.c\ + src/common/^(cli.c wpa_ctrl.c)\ src/utils/edit_simple.c\ wpa_supplicant/wpa_cli.c\ libcommon.a diff --git a/extra/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch b/extra/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch new file mode 100644 index 00000000..4477adb3 --- /dev/null +++ b/extra/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch @@ -0,0 +1,38 @@ +From ae1639dc00fe116c88403c7c23bdd76181191c7a Mon Sep 17 00:00:00 2001 +From: Christian Neukirchen <chneukirchen@gmail.com> +Date: Wed, 5 Oct 2016 16:35:48 +0200 +Subject: [PATCH] LibreSSL: Fix dh5 code + +Add LibreSSL check to old OpenSSL #ifdef guard as DH_{get0,set0}_key() +is not implemented in LibreSSL. + +Signed-off-by: Christian Neukirchen <chneukirchen@gmail.com> +--- + src/crypto/crypto_openssl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/crypto/crypto_openssl.c b/src/crypto/crypto_openssl.c +index 19e0e2b..b3d1b07 100644 +--- a/src/crypto/crypto_openssl.c ++++ b/src/crypto/crypto_openssl.c +@@ -611,7 +611,7 @@ void crypto_cipher_deinit(struct crypto_cipher *ctx) + + 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 +712,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(); +-- +2.10.1 + diff --git a/extra/hostap/rev b/extra/hostap/rev index d00491fd..0cfbf088 100644 --- a/extra/hostap/rev +++ b/extra/hostap/rev @@ -1 +1 @@ -1 +2 diff --git a/extra/hostap/src b/extra/hostap/src -Subproject 1f344cd7b4461c8bae31abc3fc450407782282e +Subproject 2462f347bca0a7cce7e06ff88adbe3aa47c52d5 |