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 /extra/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch | |
| parent | 9e24a744f0b596c83d184880698b21a4b04831e3 (diff) | |
hostap: Update to 2.6
Diffstat (limited to 'extra/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch')
| -rw-r--r-- | extra/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch | 38 |
1 files changed, 38 insertions, 0 deletions
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 + |