Index: head/security/wpa_supplicant/Makefile
===================================================================
--- head/security/wpa_supplicant/Makefile	(revision 421842)
+++ head/security/wpa_supplicant/Makefile	(revision 421843)
@@ -1,163 +1,163 @@
 # $FreeBSD$
 
 PORTNAME=	wpa_supplicant
 PORTVERSION=	2.5
 PORTREVISION=	2
 CATEGORIES=	security net
 MASTER_SITES=	http://w1.fi/releases/
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Supplicant (client) for WPA/802.1x protocols
 
-USES=		cpe gmake readline
-USE_OPENSSL=	yes
+USES=		cpe gmake readline ssl
 BUILD_WRKSRC=	${WRKSRC}/wpa_supplicant
 INSTALL_WRKSRC=	${WRKSRC}/src
 CFLAGS+=	${CPPFLAGS} # USES=readline only augments CPPFLAGS and LDFLAGS
-LDFLAGS+=	-lutil
+CFLAGS+=	-I${OPENSSLINC}
+LDFLAGS+=	-L${OPENSSLLIB} -lutil
 
 SUB_FILES=	pkg-message
 PORTDOCS=	README ChangeLog
 
 CFG=		${BUILD_WRKSRC}/.config
 
 OPTIONS_MULTI=		DRV EAP
 OPTIONS_MULTI_DRV=	BSD WIRED NDIS TEST NONE #ROBOSWITCH
 OPTIONS_MULTI_EAP=	TLS PEAP TTLS MD5 MSCHAPv2 GTC LEAP OTP PSK FAST \
 			SIM PWD PAX AKA AKA_PRIME SAKE GPSK TNC IKEv2 EKE
 OPTIONS_DEFINE=		WPS WPS_ER WPS_NOREG WPS_NFC PKCS12 SMARTCARD \
 			HT_OVERRIDES VHT_OVERRIDES TLSV12 IEEE80211W \
 			IEEE80211R DEBUG_FILE DEBUG_SYSLOG PRIVSEP \
 			DELAYED_MIC IEEE80211N IEEE80211AC INTERWORKING \
 			HS20 NO_ROAMING P2P TDLS
 OPTIONS_DEFAULT=	BSD WIRED NDIS \
 			TLS PEAP TTLS MD5 MSCHAPv2 GTC LEAP OTP PSK \
 			WPS PKCS12 SMARTCARD IEEE80211R DEBUG_SYSLOG \
 			INTERWORKING HS20
 
 WPS_DESC=		Wi-Fi Protected Setup
 WPS_ER_DESC=		Enable WPS External Registrar
 WPS_NOREG_DESC=		Disable open network credentials when registrar
 WPS_NFC_DESC=		Near Field Communication (NFC) configuration
 PKCS12_DESC=		PKCS\#12 (PFS) support
 SMARTCARD_DESC=		Private key on smartcard support
 HT_OVERRIDES_DESC=	Disable HT/HT40, mask MCS rates, etc
 VHT_OVERRIDES_DESC=	Disable VHT, mask MCS rates, etc
 TLSV12_DESC=		Build with TLS v1.2 instead of TLS v1.0
 IEEE80211AC_DESC=	Very High Throughput, AP mode (IEEE 802.11ac)
 IEEE80211N_DESC=	High Throughput, AP mode (IEEE 802.11n)
 IEEE80211R_DESC=	Fast BSS Transition (IEEE 802.11r-2008)
 IEEE80211W_DESC=	Management Frame Protection (IEEE 802.11w)
 DEBUG_FILE_DESC=	Support for writing debug log to a file
 DEBUG_SYSLOG_DESC=	Send debug messages to syslog instead of stdout
 PRIVSEP_DESC=		Privilege separation
 DELAYED_MIC_DESC=	Mitigate TKIP attack, random delay on MIC errors
 INTERWORKING_DESC=	Improve ext. network interworking (IEEE 802.11u)
 HS20_DESC=		Hotspot 2.0
 NO_ROAMING_DESC=	Disable roaming
 P2P_DESC=		Peer-to-Peer support
 TDLS_DESC=		Tunneled Direct Link Setup
 
 DRV_DESC=		Driver options
 BSD_DESC=		BSD net80211 interface
 NDIS_DESC=		Windows NDIS interface
 WIRED_DESC=		Wired ethernet interface
 ROBOSWITCH_DESC=	Broadcom Roboswitch interface
 TEST_DESC=		Development testing interface
 NONE_DESC=		The 'no driver' interface, e.g. WPS ER only
 
 EAP_DESC=		Extensible Authentication Protocols
 TLS_DESC=		Transport Layer Security
 PEAP_DESC=		Protected Extensible Authentication Protocol
 TTLS_DESC=		Tunneled Transport Layer Security
 MD5_DESC=		MD5 hash (deprecated, no key generation)
 MSCHAPv2_DESC=		Microsoft CHAP version 2 (RFC 2759)
 GTC_DESC=		Generic Token Card
 LEAP_DESC=		Lightweight Extensible Authentication Protocol
 OTP_DESC=		One-Time Password
 PSK_DESC=		Pre-Shared key
 FAST_DESC=		Flexible Authentication via Secure Tunneling
 AKA_DESC=		Autentication and Key Agreement (UMTS)
 AKA_PRIME_DESC=		AKA Prime variant (RFC 5448)
 EKE_DESC=		Encrypted Key Exchange
 SIM_DESC=		Subscriber Identity Module
 IKEv2_DESC=		Internet Key Exchange version 2
 PWD_DESC=		Shared password (RFC 5931)
 PAX_DESC=		Password Authenticated Exchange
 SAKE_DESC=		Shared-Secret Authentication & Key Establishment
 GPSK_DESC=		Generalized Pre-Shared Key
 TNC_DESC=		Trusted Network Connect
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSIM} || ${PORT_OPTIONS:MAKA} || ${PORT_OPTIONS:MAKA_PRIME}
 LIB_DEPENDS+=	libpcsclite.so:devel/pcsc-lite
 CFLAGS+=	-I${LOCALBASE}/include/PCSC
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 .if ${PORT_OPTIONS:MPRIVSEP}
 PLIST_FILES+= sbin/wpa_priv
 .endif
 
 post-patch:
 	${CP} ${FILESDIR}/Packet32.[ch] ${FILESDIR}/ntddndis.h \
 		${WRKSRC}/src/utils
 	# Set driver(s)
 .for item in BSD NDIS WIRED ROBOSWITCH TEST NONE
 .  if ${PORT_OPTIONS:M${item}}
 	@${ECHO} CONFIG_DRIVER_${item}=y >> ${CFG}
 .  endif
 .endfor
 	# Set EAP protocol(s)
 .for item in MD5 MSCHAPv2 TLS PEAP TTLS FAST GTC OTP PSK PWD PAX LEAP SIM \
 	AKA AKA_PRIME SAKE GPSK TNC IKEv2 EKE
 .  if ${PORT_OPTIONS:M${item}}
 	@${ECHO} CONFIG_EAP_${item:tu}=y >> ${CFG}
 .  endif
 .endfor
 .if ${PORT_OPTIONS:MSIM} || ${PORT_OPTIONS:MAKA} || ${PORT_OPTIONS:MAKA_PRIME}
 	@${ECHO} CONFIG_PCSC=y >> ${CFG}
 .endif
 .for simple in WPS WPS_ER WPS_NFC PKCS12 SMARTCARD HT_OVERRIDES \
 	VHT_OVERRIDES TLSV12 IEEE80211AC IEEE80211N IEEE80211R IEEE80211W \
 	INTERWORKING DEBUG_FILE DEBUG_SYSLOG HS20 NO_ROAMING PRIVSEP P2P TDLS
 .  if ${PORT_OPTIONS:M${simple}}
 	@${ECHO} CONFIG_${simple}=y >> ${CFG}
 .  endif
 .endfor
 .for item in READLINE PEERKEY
 	@${ECHO} CONFIG_${item}=y >> ${CFG}
 .endfor
 .if ${PORT_OPTIONS:MIEEE80211AC} || ${PORT_OPTIONS:MIEEE80211N}
 	@${ECHO} CONFIG_AP=y >> ${CFG}
 .endif
 .if ${PORT_OPTIONS:MGPSK}
 	# GPSK desired, assume highest SHA desired too
 	@${ECHO} CONFIG_EAP_GPSK_SHA256=y >> ${CFG}
 .endif
 .if ${PORT_OPTIONS:MWPS_NOREG}
 	@${ECHO} CONFIG_WPS_REG_DISABLE_OPEN=y >> ${CFG}
 .endif
 .if ${PORT_OPTIONS:MDELAYED_MIC}
 	@${ECHO} CONFIG_DELAYED_MIC_ERROR_REPORT=y >> ${CFG}
 .endif
 	@${ECHO} CONFIG_OS=unix >> ${CFG}
 	@${ECHO} CONFIG_CTRL_IFACE=unix >> ${CFG}
 	@${ECHO} CONFIG_BACKEND=file >> ${CFG}
 	@${ECHO} CONFIG_L2_PACKET=freebsd >> ${CFG}
 	@${ECHO} CONFIG_TLS=openssl >> ${CFG}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} wpa_supplicant wpa_cli \
 		wpa_passphrase ${STAGEDIR}${PREFIX}/sbin)
 .if ${PORT_OPTIONS:MPRIVSEP}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/wpa_priv ${STAGEDIR}${PREFIX}/sbin
 .endif
 	${INSTALL_DATA} ${BUILD_WRKSRC}/wpa_supplicant.conf \
 		${STAGEDIR}${PREFIX}/etc/wpa_supplicant.conf.sample
 	(cd ${BUILD_WRKSRC} && \
 		${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c
===================================================================
--- head/security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c	(nonexistent)
+++ head/security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c	(revision 421843)
@@ -0,0 +1,67 @@
+Compatibility fixes for LibreSSL
+
+--- src/crypto/tls_openssl.c.orig	2015-09-27 19:02:05 UTC
++++ src/crypto/tls_openssl.c
+@@ -2229,7 +2229,7 @@ static int tls_parse_pkcs12(struct tls_d
+ 	}
+ 
+ 	if (certs) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 		SSL_clear_chain_certs(ssl);
+ 		while ((cert = sk_X509_pop(certs)) != NULL) {
+ 			X509_NAME_oneline(X509_get_subject_name(cert), buf,
+@@ -2247,7 +2247,7 @@ static int tls_parse_pkcs12(struct tls_d
+ 			/* Try to continue anyway */
+ 		}
+ 		sk_X509_free(certs);
+-#ifndef OPENSSL_IS_BORINGSSL
++#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER)
+ 		res = SSL_build_cert_chain(ssl,
+ 					   SSL_BUILD_CHAIN_FLAG_CHECK |
+ 					   SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR);
+@@ -2812,7 +2812,7 @@ int tls_connection_get_random(void *ssl_
+ 	if (conn == NULL || keys == NULL)
+ 		return -1;
+ 	ssl = conn->ssl;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)
+ 		return -1;
+ 
+@@ -2841,7 +2841,7 @@ int tls_connection_get_random(void *ssl_
+ #ifndef CONFIG_FIPS
+ static int openssl_get_keyblock_size(SSL *ssl)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	const EVP_CIPHER *c;
+ 	const EVP_MD *h;
+ 	int md_size;
+@@ -2911,7 +2911,7 @@ static int openssl_tls_prf(struct tls_co
+ 		   "mode");
+ 	return -1;
+ #else /* CONFIG_FIPS */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	SSL *ssl;
+ 	u8 *rnd;
+ 	int ret = -1;
+@@ -3394,7 +3394,7 @@ int tls_connection_set_cipher_list(void
+ 
+ 	wpa_printf(MSG_DEBUG, "OpenSSL: cipher suites: %s", buf + 1);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ #if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
+ 	if (os_strstr(buf, ":ADH-")) {
+ 		/*
+@@ -3977,7 +3977,7 @@ static int tls_sess_sec_cb(SSL *s, void
+ 	struct tls_connection *conn = arg;
+ 	int ret;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	if (conn == NULL || conn->session_ticket_cb == NULL)
+ 		return 0;
+ 

Property changes on: head/security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property