From 9440d7206bfe6963f8b5243b1ed8a5ae67353280 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Wed, 5 Oct 2016 13:32:55 +0200 Subject: [PATCH] wpa_supplicant: fix for libressl. --- srcpkgs/wpa_supplicant/patches/libressl.patch | 29 +++++++++++++++++++ srcpkgs/wpa_supplicant/template | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/srcpkgs/wpa_supplicant/patches/libressl.patch b/srcpkgs/wpa_supplicant/patches/libressl.patch index 24825dc09ea..0037a9fdcbc 100644 --- a/srcpkgs/wpa_supplicant/patches/libressl.patch +++ b/srcpkgs/wpa_supplicant/patches/libressl.patch @@ -18,3 +18,32 @@ DH *dh; dh = DH_new(); +--- src/crypto/tls_openssl.c.orig ++++ src/crypto/tls_openssl.c +@@ -919,7 +919,7 @@ + } + #endif /* OPENSSL_FIPS */ + #endif /* CONFIG_FIPS */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + SSL_load_error_strings(); + SSL_library_init(); + #ifndef OPENSSL_NO_SHA256 +@@ -1043,7 +1043,7 @@ + + tls_openssl_ref_count--; + if (tls_openssl_ref_count == 0) { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #ifndef OPENSSL_NO_ENGINE + ENGINE_cleanup(); + #endif /* OPENSSL_NO_ENGINE */ +@@ -2334,7 +2334,7 @@ + return 0; + + #ifdef PKCS12_FUNCS +-#if OPENSSL_VERSION_NUMBER < 0x10002000L ++#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) + /* + * Clear previously set extra chain certificates, if any, from PKCS#12 + * processing in tls_parse_pkcs12() to allow OpenSSL to build a new diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index 595e06164af..ca3ea15ff5e 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,7 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=2.6 -revision=1 +revision=2 build_wrksrc=$pkgname short_desc="WPA/WPA2/IEEE 802.1X Supplicant" maintainer="Juan RP "