Attachment #213663 for bug #245809





PORTNAME=	wpa_supplicant
PORTVERSION=	2.9
PORTREVISION=	4
CATEGORIES=	security net
MASTER_SITES=	https://w1.fi/releases/


			HT_OVERRIDES VHT_OVERRIDES TLSV12 IEEE80211W \
			IEEE80211R DEBUG_FILE DEBUG_SYSLOG PRIVSEP \
			DELAYED_MIC IEEE80211N IEEE80211AC INTERWORKING \
			IEEE8021X_EAPOL EAPOL_TEST \
			HS20 NO_ROAMING P2P TDLS DBUS DOCS
OPTIONS_DEFAULT=	BSD WIRED NDIS \
			TLS PEAP TTLS MD5 MSCHAPV2 GTC LEAP OTP PSK \

IEEE80211R_DESC=	Fast BSS Transition (IEEE 802.11r-2008)
IEEE80211W_DESC=	Management Frame Protection (IEEE 802.11w)
IEEE8021X_EAPOL_DESC=	EAP over LAN support
EAPOL_TEST_DESC=	Development testing
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

.endif
.for simple in WPS WPS_ER WPS_NFC WPS_UPNP PKCS12 SMARTCARD HT_OVERRIDES \
	VHT_OVERRIDES TLSV12 IEEE80211AC IEEE80211N IEEE80211R IEEE80211W \
	IEEE8021X_EAPOL EAPOL_TEST \
	INTERWORKING DEBUG_FILE DEBUG_SYSLOG HS20 NO_ROAMING PRIVSEP P2P TDLS
.  if ${PORT_OPTIONS:M${simple}}
	@${ECHO_CMD} CONFIG_${simple}=y >> ${CFG}

	@${ECHO_CMD} CONFIG_L2_PACKET=freebsd >> ${CFG}
	@${ECHO_CMD} CONFIG_TLS=openssl >> ${CFG}

.if ${PORT_OPTIONS:MEAPOL_TEST}
PLIST_SUB+=	EAPOL_TEST=""
.else
PLIST_SUB+=	EAPOL_TEST="@comment "
.endif

post-build-EAPOL_TEST-on:
	cd ${BUILD_WRKSRC} && ${GMAKE} eapol_test

do-install:
	(cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} wpa_supplicant wpa_cli \
		wpa_passphrase ${STAGEDIR}${PREFIX}/sbin)

	${INSTALL_DATA} ${BUILD_WRKSRC}/wpa_supplicant.conf \
		${STAGEDIR}${PREFIX}/etc/wpa_supplicant.conf.sample

do-install-EAPOL_TEST-on:
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/eapol_test ${STAGEDIR}${PREFIX}/sbin

do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${BUILD_WRKSRC} && \

Lines 114-120 Link Here

(-)security/wpa_supplicant/files/Packet32.c (-2 / +1 lines)
114	{	114	{
115	struct adapter *a;	115	struct adapter *a;
116	int s;	116	int s;
117	int ifflags;
118	struct ifreq ifr;	117	struct ifreq ifr;
119	struct ieee80211req ireq;	118	struct ieee80211req ireq;
120		119
Lines 245-251 Link Here
245	char buf, lim, *next;	244	char buf, lim, *next;
246	char *plist;	245	char *plist;
247	int spc;	246	int spc;
248	int i, ifcnt = 0;	247	int ifcnt = 0;
249		248
250	plist = namelist;	249	plist = namelist;
251	spc = 0;	250	spc = 0;

Lines 11-17 Link Here

(-)security/wpa_supplicant/files/ntddndis.h (+4 lines)
11	#define UCHAR uint8_t	11	#define UCHAR uint8_t
12	#define LONG int32_t	12	#define LONG int32_t
13	#define SHORT int16_t	13	#define SHORT int16_t
		14	#if __FreeBSD__
		15	#define CHAR char
		16	#else
14	#define CHAR int8_t	17	#define CHAR int8_t
		18	#endif
15	#define ULONGLONG uint64_t	19	#define ULONGLONG uint64_t
16	#define LONGLONG int64_t	20	#define LONGLONG int64_t
17	#define BOOLEAN uint8_t	21	#define BOOLEAN uint8_t




--- src/drivers/driver_ndis.c.orig	2019-08-07 13:25:25 UTC
+++ src/drivers/driver_ndis.c
@@ -504,13 +504,13 @@ static int ndis_get_oid(struct wpa_drive
 	o->Length = len;
 
 	if (!PacketRequest(drv->adapter, FALSE, o)) {
-		wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%d) failed",
+		wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%lu) failed",
 			   __func__, oid, len);
 		os_free(buf);
 		return -1;
 	}
 	if (o->Length > len) {
-		wpa_printf(MSG_DEBUG, "%s: oid=0x%x Length (%d) > len (%d)",
+		wpa_printf(MSG_DEBUG, "%s: oid=0x%x Length (%d) > len (%lu)",
 			   __func__, oid, (unsigned int) o->Length, len);
 		os_free(buf);
 		return -1;
@@ -573,7 +573,7 @@ static int ndis_set_oid(struct wpa_drive
 		os_memcpy(o->Data, data, len);
 
 	if (!PacketRequest(drv->adapter, TRUE, o)) {
-		wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%d) failed",
+		wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%lu) failed",
 			   __func__, oid, len);
 		os_free(buf);
 		return -1;
@@ -1531,7 +1531,7 @@ static void wpa_driver_ndis_event_auth(s
 
 	if (data_len < sizeof(*req)) {
 		wpa_printf(MSG_DEBUG, "NDIS: Too short Authentication Request "
-			   "Event (len=%d)", data_len);
+			   "Event (len=%lu)", data_len);
 		return;
 	}
 	req = (NDIS_802_11_AUTHENTICATION_REQUEST *) data;
@@ -1565,7 +1565,7 @@ static void wpa_driver_ndis_event_pmkid(
 
 	if (data_len < 8) {
 		wpa_printf(MSG_DEBUG, "NDIS: Too short PMKID Candidate List "
-			   "Event (len=%d)", data_len);
+			   "Event (len=%lu)", data_len);
 		return;
 	}
 	pmkid = (NDIS_802_11_PMKID_CANDIDATE_LIST *) data;
@@ -1587,7 +1587,7 @@ static void wpa_driver_ndis_event_pmkid(
 	os_memset(&event, 0, sizeof(event));
 	for (i = 0; i < pmkid->NumCandidates; i++) {
 		PMKID_CANDIDATE *p = &pmkid->CandidateList[i];
-		wpa_printf(MSG_DEBUG, "NDIS: %d: " MACSTR " Flags 0x%x",
+		wpa_printf(MSG_DEBUG, "NDIS: %lu: " MACSTR " Flags 0x%x",
 			   i, MAC2STR(p->BSSID), (int) p->Flags);
 		os_memcpy(event.pmkid_candidate.bssid, p->BSSID, ETH_ALEN);
 		event.pmkid_candidate.index = i;
@@ -1778,7 +1778,7 @@ static void wpa_driver_ndis_get_capabili
 				   "overflow");
 			break;
 		}
-		wpa_printf(MSG_MSGDUMP, "NDIS: %d - auth %d encr %d",
+		wpa_printf(MSG_MSGDUMP, "NDIS: %lu - auth %d encr %d",
 			   i, (int) ae->AuthModeSupported,
 			   (int) ae->EncryptStatusSupported);
 		switch (ae->AuthModeSupported) {
@@ -2106,7 +2106,11 @@ static int wpa_driver_ndis_get_names(str
 		dlen = dpos - desc;
 	else
 		dlen = os_strlen(desc);

 	os_free(b);
 	if (drv->adapter_desc == NULL)
 		return -1;
@@ -2274,7 +2278,11 @@ static int wpa_driver_ndis_get_names(str
 	} else {
 		dlen = os_strlen(desc[i]);
 	}

Lines 1-3 Link Here

(-)security/wpa_supplicant/pkg-plist (+1 lines)
		1	%%EAPOL_TEST%%sbin/eapol_test
1	sbin/wpa_supplicant	2	sbin/wpa_supplicant
2	sbin/wpa_passphrase	3	sbin/wpa_passphrase
3	sbin/wpa_cli	4	sbin/wpa_cli

Return to bug 245809

Lines 2-8 Link Here

(-)security/wpa_supplicant/Makefile (-3 / +16 lines)
2		2
3	PORTNAME= wpa_supplicant	3	PORTNAME= wpa_supplicant
4	PORTVERSION= 2.9	4	PORTVERSION= 2.9
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= security net	6	CATEGORIES= security net
7	MASTER_SITES= https://w1.fi/releases/	7	MASTER_SITES= https://w1.fi/releases/
8		8
Lines 39-45 Link Here
39	HT_OVERRIDES VHT_OVERRIDES TLSV12 IEEE80211W \	39	HT_OVERRIDES VHT_OVERRIDES TLSV12 IEEE80211W \
40	IEEE80211R DEBUG_FILE DEBUG_SYSLOG PRIVSEP \	40	IEEE80211R DEBUG_FILE DEBUG_SYSLOG PRIVSEP \
41	DELAYED_MIC IEEE80211N IEEE80211AC INTERWORKING \	41	DELAYED_MIC IEEE80211N IEEE80211AC INTERWORKING \
42	IEEE8021X_EAPOL \	42	IEEE8021X_EAPOL EAPOL_TEST \
43	HS20 NO_ROAMING P2P TDLS DBUS DOCS	43	HS20 NO_ROAMING P2P TDLS DBUS DOCS
44	OPTIONS_DEFAULT= BSD WIRED NDIS \	44	OPTIONS_DEFAULT= BSD WIRED NDIS \
45	TLS PEAP TTLS MD5 MSCHAPV2 GTC LEAP OTP PSK \	45	TLS PEAP TTLS MD5 MSCHAPV2 GTC LEAP OTP PSK \
Lines 63-68 Link Here
63	IEEE80211R_DESC= Fast BSS Transition (IEEE 802.11r-2008)	63	IEEE80211R_DESC= Fast BSS Transition (IEEE 802.11r-2008)
64	IEEE80211W_DESC= Management Frame Protection (IEEE 802.11w)	64	IEEE80211W_DESC= Management Frame Protection (IEEE 802.11w)
65	IEEE8021X_EAPOL_DESC= EAP over LAN support	65	IEEE8021X_EAPOL_DESC= EAP over LAN support
		66	EAPOL_TEST_DESC= Development testing
66	DEBUG_FILE_DESC= Support for writing debug log to a file	67	DEBUG_FILE_DESC= Support for writing debug log to a file
67	DEBUG_SYSLOG_DESC= Send debug messages to syslog instead of stdout	68	DEBUG_SYSLOG_DESC= Send debug messages to syslog instead of stdout
68	PRIVSEP_DESC= Privilege separation	69	PRIVSEP_DESC= Privilege separation
Lines 148-154 Link Here
148	.endif	149	.endif
149	.for simple in WPS WPS_ER WPS_NFC WPS_UPNP PKCS12 SMARTCARD HT_OVERRIDES \	150	.for simple in WPS WPS_ER WPS_NFC WPS_UPNP PKCS12 SMARTCARD HT_OVERRIDES \
150	VHT_OVERRIDES TLSV12 IEEE80211AC IEEE80211N IEEE80211R IEEE80211W \	151	VHT_OVERRIDES TLSV12 IEEE80211AC IEEE80211N IEEE80211R IEEE80211W \
151	IEEE8021X_EAPOL \	152	IEEE8021X_EAPOL EAPOL_TEST \
152	INTERWORKING DEBUG_FILE DEBUG_SYSLOG HS20 NO_ROAMING PRIVSEP P2P TDLS	153	INTERWORKING DEBUG_FILE DEBUG_SYSLOG HS20 NO_ROAMING PRIVSEP P2P TDLS
153	. if ${PORT_OPTIONS:M${simple}}	154	. if ${PORT_OPTIONS:M${simple}}
154	@${ECHO_CMD} CONFIG_${simple}=y >> ${CFG}	155	@${ECHO_CMD} CONFIG_${simple}=y >> ${CFG}
Lines 180-185 Link Here
180	@${ECHO_CMD} CONFIG_L2_PACKET=freebsd >> ${CFG}	181	@${ECHO_CMD} CONFIG_L2_PACKET=freebsd >> ${CFG}
181	@${ECHO_CMD} CONFIG_TLS=openssl >> ${CFG}	182	@${ECHO_CMD} CONFIG_TLS=openssl >> ${CFG}
182		183
		184	.if ${PORT_OPTIONS:MEAPOL_TEST}
		185	PLIST_SUB+= EAPOL_TEST=""
		186	.else
		187	PLIST_SUB+= EAPOL_TEST="@comment "
		188	.endif
		189
		190	post-build-EAPOL_TEST-on:
		191	cd ${BUILD_WRKSRC} && ${GMAKE} eapol_test
		192
183	do-install:	193	do-install:
184	(cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} wpa_supplicant wpa_cli \	194	(cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} wpa_supplicant wpa_cli \
185	wpa_passphrase ${STAGEDIR}${PREFIX}/sbin)	195	wpa_passphrase ${STAGEDIR}${PREFIX}/sbin)
Lines 186-191 Link Here
186	${INSTALL_DATA} ${BUILD_WRKSRC}/wpa_supplicant.conf \	196	${INSTALL_DATA} ${BUILD_WRKSRC}/wpa_supplicant.conf \
187	${STAGEDIR}${PREFIX}/etc/wpa_supplicant.conf.sample	197	${STAGEDIR}${PREFIX}/etc/wpa_supplicant.conf.sample
188		198
		199	do-install-EAPOL_TEST-on:
		200	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/eapol_test ${STAGEDIR}${PREFIX}/sbin
		201
189	do-install-DOCS-on:	202	do-install-DOCS-on:
190	@${MKDIR} ${STAGEDIR}${DOCSDIR}	203	@${MKDIR} ${STAGEDIR}${DOCSDIR}
191	(cd ${BUILD_WRKSRC} && \	204	(cd ${BUILD_WRKSRC} && \

Lines 1-6 Link Here

(-)security/wpa_supplicant/files/patch-src_drivers_driver__ndis.c (-3 / +64 lines)
1	--- src/drivers/driver_ndis.c.orig 2015-03-15 17:30:39 UTC	1	--- src/drivers/driver_ndis.c.orig 2019-08-07 13:25:25 UTC
2	+++ src/drivers/driver_ndis.c	2	+++ src/drivers/driver_ndis.c
3	@@ -2110,7 +2110,11 @@ static int wpa_driver_ndis_get_names(str	3	@@ -504,13 +504,13 @@ static int ndis_get_oid(struct wpa_drive
		4	o->Length = len;
		5
		6	if (!PacketRequest(drv->adapter, FALSE, o)) {
		7	- wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%d) failed",
		8	+ wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%lu) failed",
		9	__func__, oid, len);
		10	os_free(buf);
		11	return -1;
		12	}
		13	if (o->Length > len) {
		14	- wpa_printf(MSG_DEBUG, "%s: oid=0x%x Length (%d) > len (%d)",
		15	+ wpa_printf(MSG_DEBUG, "%s: oid=0x%x Length (%d) > len (%lu)",
		16	__func__, oid, (unsigned int) o->Length, len);
		17	os_free(buf);
		18	return -1;
		19	@@ -573,7 +573,7 @@ static int ndis_set_oid(struct wpa_drive
		20	os_memcpy(o->Data, data, len);
		21
		22	if (!PacketRequest(drv->adapter, TRUE, o)) {
		23	- wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%d) failed",
		24	+ wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%lu) failed",
		25	__func__, oid, len);
		26	os_free(buf);
		27	return -1;
		28	@@ -1531,7 +1531,7 @@ static void wpa_driver_ndis_event_auth(s
		29
		30	if (data_len < sizeof(*req)) {
		31	wpa_printf(MSG_DEBUG, "NDIS: Too short Authentication Request "
		32	- "Event (len=%d)", data_len);
		33	+ "Event (len=%lu)", data_len);
		34	return;
		35	}
		36	req = (NDIS_802_11_AUTHENTICATION_REQUEST *) data;
		37	@@ -1565,7 +1565,7 @@ static void wpa_driver_ndis_event_pmkid(
		38
		39	if (data_len < 8) {
		40	wpa_printf(MSG_DEBUG, "NDIS: Too short PMKID Candidate List "
		41	- "Event (len=%d)", data_len);
		42	+ "Event (len=%lu)", data_len);
		43	return;
		44	}
		45	pmkid = (NDIS_802_11_PMKID_CANDIDATE_LIST *) data;
		46	@@ -1587,7 +1587,7 @@ static void wpa_driver_ndis_event_pmkid(
		47	os_memset(&event, 0, sizeof(event));
		48	for (i = 0; i < pmkid->NumCandidates; i++) {
		49	PMKID_CANDIDATE *p = &pmkid->CandidateList[i];
		50	- wpa_printf(MSG_DEBUG, "NDIS: %d: " MACSTR " Flags 0x%x",
		51	+ wpa_printf(MSG_DEBUG, "NDIS: %lu: " MACSTR " Flags 0x%x",
		52	i, MAC2STR(p->BSSID), (int) p->Flags);
		53	os_memcpy(event.pmkid_candidate.bssid, p->BSSID, ETH_ALEN);
		54	event.pmkid_candidate.index = i;
		55	@@ -1778,7 +1778,7 @@ static void wpa_driver_ndis_get_capabili
		56	"overflow");
		57	break;
		58	}
		59	- wpa_printf(MSG_MSGDUMP, "NDIS: %d - auth %d encr %d",
		60	+ wpa_printf(MSG_MSGDUMP, "NDIS: %lu - auth %d encr %d",
		61	i, (int) ae->AuthModeSupported,
		62	(int) ae->EncryptStatusSupported);
		63	switch (ae->AuthModeSupported) {
		64	@@ -2106,7 +2106,11 @@ static int wpa_driver_ndis_get_names(str
4	dlen = dpos - desc;	65	dlen = dpos - desc;
5	else	66	else
6	dlen = os_strlen(desc);	67	dlen = os_strlen(desc);
Lines 13-19 Link Here
13	os_free(b);	74	os_free(b);
14	if (drv->adapter_desc == NULL)	75	if (drv->adapter_desc == NULL)
15	return -1;	76	return -1;
16	@@ -2278,7 +2282,11 @@ static int wpa_driver_ndis_get_names(str	77	@@ -2274,7 +2278,11 @@ static int wpa_driver_ndis_get_names(str
17	} else {	78	} else {
18	dlen = os_strlen(desc[i]);	79	dlen = os_strlen(desc[i]);
19	}	80	}