Index: contrib/wpa/src/drivers/driver_ndis.c
===================================================================
--- contrib/wpa/src/drivers/driver_ndis.c
+++ contrib/wpa/src/drivers/driver_ndis.c
@@ -504,13 +504,13 @@
 	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 (%zu) 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 (%u) > len (%zu)",
 			   __func__, oid, (unsigned int) o->Length, len);
 		os_free(buf);
 		return -1;
@@ -573,7 +573,7 @@
 		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 (%zu) failed",
 			   __func__, oid, len);
 		os_free(buf);
 		return -1;
@@ -1536,7 +1536,7 @@
 
 	if (data_len < sizeof(*req)) {
 		wpa_printf(MSG_DEBUG, "NDIS: Too short Authentication Request "
-			   "Event (len=%d)", data_len);
+			   "Event (len=%zu)", data_len);
 		return;
 	}
 	req = (NDIS_802_11_AUTHENTICATION_REQUEST *) data;
@@ -1570,7 +1570,7 @@
 
 	if (data_len < 8) {
 		wpa_printf(MSG_DEBUG, "NDIS: Too short PMKID Candidate List "
-			   "Event (len=%d)", data_len);
+			   "Event (len=%zu)", data_len);
 		return;
 	}
 	pmkid = (NDIS_802_11_PMKID_CANDIDATE_LIST *) data;
@@ -1592,7 +1592,7 @@
 	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: %zu: " 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;
@@ -1783,7 +1783,7 @@
 				   "overflow");
 			break;
 		}
-		wpa_printf(MSG_MSGDUMP, "NDIS: %d - auth %d encr %d",
+		wpa_printf(MSG_MSGDUMP, "NDIS: %zu - auth %d encr %d",
 			   i, (int) ae->AuthModeSupported,
 			   (int) ae->EncryptStatusSupported);
 		switch (ae->AuthModeSupported) {
@@ -2139,13 +2139,13 @@
 	if (_names == NULL)
 		return -1;
 
-	res = PacketGetAdapterNames(_names, &len);
+	res = PacketGetAdapterNames((int8_t*)_names, &len);
 	if (!res && len > 8192) {
 		os_free(_names);
 		_names = os_zalloc(len);
 		if (_names == NULL)
 			return -1;
-		res = PacketGetAdapterNames(_names, &len);
+		res = PacketGetAdapterNames((int8_t*)_names, &len);
 	}
 
 	if (!res) {
@@ -2761,7 +2761,7 @@
 #else /* CONFIG_USE_NDISUIO */
 	char ifname[128];
 	os_snprintf(ifname, sizeof(ifname), "\\Device\\NPF_%s", drv->ifname);
-	drv->adapter = PacketOpenAdapter(ifname);
+	drv->adapter = PacketOpenAdapter((int8_t*)ifname);
 	if (drv->adapter == NULL) {
 		wpa_printf(MSG_DEBUG, "NDIS: PacketOpenAdapter failed for "
 			   "'%s'", ifname);
@@ -3064,13 +3064,13 @@
 	if (_names == NULL)
 		return NULL;
 
-	res = PacketGetAdapterNames(_names, &len);
+	res = PacketGetAdapterNames((int8_t*)_names, &len);
 	if (!res && len > 8192) {
 		os_free(_names);
 		_names = os_zalloc(len);
 		if (_names == NULL)
 			return NULL;
-		res = PacketGetAdapterNames(_names, &len);
+		res = PacketGetAdapterNames((int8_t*)_names, &len);
 	}
 
 	if (!res) {
Index: usr.sbin/wpa/wpa_supplicant/Packet32.c
===================================================================
--- usr.sbin/wpa/wpa_supplicant/Packet32.c
+++ usr.sbin/wpa/wpa_supplicant/Packet32.c
@@ -125,15 +125,15 @@
 		return(NULL);
 
 	a->socket = s;
-	if (strncmp(iface, "\\Device\\NPF_", 12) == 0)
+	if (strncmp((const char*)iface, "\\Device\\NPF_", 12) == 0)
 		iface += 12;
-	else if (strncmp(iface, "\\DEVICE\\", 8) == 0)
+	else if (strncmp((const char*)iface, "\\DEVICE\\", 8) == 0)
 		iface += 8;
 	snprintf(a->name, IFNAMSIZ, "%s", iface);
 
 	/* Turn off net80211 roaming */
 	bzero((char *)&ireq, sizeof(ireq));
-	strncpy(ireq.i_name, iface, sizeof (ifr.ifr_name));
+	strncpy(ireq.i_name, (const char*)iface, sizeof (ifr.ifr_name));
 	ireq.i_type = IEEE80211_IOC_ROAMING;
 	if (ioctl(a->socket, SIOCG80211, &ireq) == 0) {
 		a->prev_roaming = ireq.i_val;
@@ -144,7 +144,7 @@
 	}
 
 	bzero((char *)&ifr, sizeof(ifr));
-        strncpy(ifr.ifr_name, iface, sizeof (ifr.ifr_name));
+        strncpy(ifr.ifr_name, (const char*)iface, sizeof (ifr.ifr_name));
         if (ioctl(a->socket, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) {
 		free(a);
 		close(s);
@@ -244,7 +244,7 @@
 	int			spc;
 	int			i, ifcnt = 0;
 
-	plist = namelist;
+	plist = (char*)namelist;
 	spc = 0;
 
 	bzero(plist, *len);