mka: Get rid of struct ieee802_1x_cp_conf

[mech_eap.git] / wlantest / inject.c

diff --git a/wlantest/inject.c b/wlantest/inject.c
index ab8d113..ed25033 100644 (file)
--- a/wlantest/inject.c
+++ b/wlantest/inject.c
@@ -1,6 +1,6 @@
 /*
  * wlantest frame injection
- * Copyright (c) 2010, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2010-2015, Jouni Malinen <j@w1.fi>
  *
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
@@ -50,7 +50,7 @@ static int inject_frame(int s, const void *data, size_t len)
 
        ret = sendmsg(s, &msg, 0);
        if (ret < 0)
-               perror("sendmsg");
+               wpa_printf(MSG_ERROR, "sendmsg: %s", strerror(errno));
        return ret;
 }
 
@@ -82,17 +82,18 @@ static int wlantest_inject_bip(struct wlantest *wt, struct wlantest_bss *bss,
                               u8 *frame, size_t len, int incorrect_key)
 {
        u8 *prot;
-       u8 dummy[16];
+       u8 dummy[32];
        int ret;
        size_t plen;
 
-       if (!bss->igtk_set[bss->igtk_idx])
+       if (!bss->igtk_len[bss->igtk_idx])
                return -1;
 
        os_memset(dummy, 0x11, sizeof(dummy));
        inc_byte_array(bss->ipn[bss->igtk_idx], 6);
 
        prot = bip_protect(incorrect_key ? dummy : bss->igtk[bss->igtk_idx],
+                          bss->igtk_len[bss->igtk_idx],
                           frame, len, bss->ipn[bss->igtk_idx],
                           bss->igtk_idx, &plen);
        if (prot == NULL)
@@ -247,11 +248,11 @@ static int wlantest_inject_prot(struct wlantest *wt, struct wlantest_bss *bss,
                                     frame, len, hdrlen, qos, pn, 0,
                                     &crypt_len);
        else if (sta->pairwise_cipher == WPA_CIPHER_TKIP)
-               crypt = tkip_encrypt(incorrect_key ? dummy : sta->ptk.tk1,
+               crypt = tkip_encrypt(incorrect_key ? dummy : sta->ptk.tk,
                                     frame, len, hdrlen, qos, pn, 0,
                                     &crypt_len);
        else
-               crypt = ccmp_encrypt(incorrect_key ? dummy : sta->ptk.tk1,
+               crypt = ccmp_encrypt(incorrect_key ? dummy : sta->ptk.tk,
                                     frame, len, hdrlen, qos, pn, 0,
                                     &crypt_len);
 
@@ -285,9 +286,8 @@ int wlantest_inject(struct wlantest *wt, struct wlantest_bss *bss,
                return -1;
        }
 
-       if (prot != WLANTEST_INJECT_UNPROTECTED &&
-           (bss == NULL || sta == NULL)) {
-               wpa_printf(MSG_INFO, "No BSS/STA information to inject "
+       if (prot != WLANTEST_INJECT_UNPROTECTED && bss == NULL) {
+               wpa_printf(MSG_INFO, "No BSS information to inject "
                           "protected frames");
                return -1;
        }
@@ -301,7 +301,7 @@ int wlantest_inject(struct wlantest *wt, struct wlantest_bss *bss,
             prot == WLANTEST_INJECT_INCORRECT_KEY) && bss) {
                if (!sta &&
                    ((WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_MGMT &&
-                     !bss->igtk_set[bss->igtk_idx]) ||
+                     !bss->igtk_len[bss->igtk_idx]) ||
                     (WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_DATA &&
                      !bss->gtk_len[bss->gtk_idx]))) {
                        wpa_printf(MSG_INFO, "No GTK/IGTK known for "
@@ -324,7 +324,7 @@ int wlantest_inject(struct wlantest *wt, struct wlantest_bss *bss,
                            bss->gtk_len[bss->gtk_idx])
                                protect = 1;
                        if (WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_MGMT &&
-                           bss->igtk_set[bss->igtk_idx])
+                           bss->igtk_len[bss->igtk_idx])
                                protect = 1;
                }
        }