aboutsummaryrefslogtreecommitdiff
path: root/security/wpa_supplicant/files/patch-src_drivers_driver__ndis.c
diff options
context:
space:
mode:
Diffstat (limited to 'security/wpa_supplicant/files/patch-src_drivers_driver__ndis.c')
-rw-r--r--security/wpa_supplicant/files/patch-src_drivers_driver__ndis.c67
1 files changed, 64 insertions, 3 deletions
diff --git a/security/wpa_supplicant/files/patch-src_drivers_driver__ndis.c b/security/wpa_supplicant/files/patch-src_drivers_driver__ndis.c
index 56348691d494..5c58337c4b3d 100644
--- a/security/wpa_supplicant/files/patch-src_drivers_driver__ndis.c
+++ b/security/wpa_supplicant/files/patch-src_drivers_driver__ndis.c
@@ -1,6 +1,67 @@
---- src/drivers/driver_ndis.c.orig 2015-03-15 17:30:39 UTC
+--- src/drivers/driver_ndis.c.orig 2019-08-07 13:25:25 UTC
+++ src/drivers/driver_ndis.c
-@@ -2110,7 +2110,11 @@ static int wpa_driver_ndis_get_names(str
+@@ -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);
@@ -13,7 +74,7 @@
os_free(b);
if (drv->adapter_desc == NULL)
return -1;
-@@ -2278,7 +2282,11 @@ static int wpa_driver_ndis_get_names(str
+@@ -2274,7 +2278,11 @@ static int wpa_driver_ndis_get_names(str
} else {
dlen = os_strlen(desc[i]);
}