mirror of
https://git.freebsd.org/ports.git
synced 2025-05-14 08:11:50 -04:00
7b4de10579
Add an option option to builds and installs the eapol_test program. Update/patch to solve new compilation errors that result with the option enabled. Note: Leaving the changes to Packet32.c out of the PR patch set as it is not needed. PR: 245809 Approved by: cy (maintainer)
89 lines
3 KiB
C
89 lines
3 KiB
C
--- 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);
|
|
- drv->adapter_desc = dup_binstr(desc, dlen);
|
|
+ drv->adapter_desc = os_malloc(dlen + 1);
|
|
+ if (drv->adapter_desc) {
|
|
+ os_memcpy(drv->adapter_desc, desc, dlen);
|
|
+ drv->adapter_desc[dlen] = '\0';
|
|
+ }
|
|
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]);
|
|
}
|
|
- drv->adapter_desc = dup_binstr(desc[i], dlen);
|
|
+ drv->adapter_desc = os_malloc(dlen + 1);
|
|
+ if (drv->adapter_desc) {
|
|
+ os_memcpy(drv->adapter_desc, desc[i], dlen);
|
|
+ drv->adapter_desc[dlen] = '\0';
|
|
+ }
|
|
os_free(names);
|
|
if (drv->adapter_desc == NULL)
|
|
return -1;
|