wlantest: Store PMK-R1 in STA entry

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/wlantest/rx_eapol.c b/wlantest/rx_eapol.c
index c80837ba751062cde08b4837a943b1c0b3769ddc..4dff7f8dd97149886d93124116a9734ad79ec75b 100644 (file)
--- a/wlantest/rx_eapol.c
+++ b/wlantest/rx_eapol.c
@@ -100,8 +100,6 @@ static int try_pmk(struct wlantest *wt, struct wlantest_bss *bss,
        struct wpa_ptk ptk;
 
        if (wpa_key_mgmt_ft(sta->key_mgmt)) {
-               u8 pmk_r1[PMK_LEN];
-               u8 pmk_r1_name[WPA_PMK_NAME_LEN];
                u8 ptk_name[WPA_PMK_NAME_LEN];
                int use_sha384 = wpa_key_mgmt_sha384(sta->key_mgmt);
 
@@ -112,22 +110,16 @@ static int try_pmk(struct wlantest *wt, struct wlantest_bss *bss,
                                      use_sha384) < 0)
                        return -1;
                sta->pmk_r0_len = use_sha384 ? PMK_LEN_SUITE_B_192 : PMK_LEN;
-               wpa_hexdump(MSG_DEBUG, "FT: PMK-R0", sta->pmk_r0,
-                           sta->pmk_r0_len);
-               wpa_hexdump(MSG_DEBUG, "FT: PMKR0Name", sta->pmk_r0_name,
-                           WPA_PMK_NAME_LEN);
                if (wpa_derive_pmk_r1(sta->pmk_r0, sta->pmk_r0_len,
                                      sta->pmk_r0_name,
                                      bss->r1kh_id, sta->addr,
-                                     pmk_r1, pmk_r1_name) < 0)
+                                     sta->pmk_r1, sta->pmk_r1_name) < 0)
                        return -1;
-               wpa_hexdump_key(MSG_DEBUG, "FT: PMK-R1", pmk_r1, PMK_LEN);
-               wpa_hexdump(MSG_DEBUG, "FT: PMKR1Name", pmk_r1_name,
-                           WPA_PMK_NAME_LEN);
-               if (wpa_pmk_r1_to_ptk(pmk_r1, PMK_LEN, sta->snonce, sta->anonce,
-                                     sta->addr,
-                                     bss->bssid, pmk_r1_name, &ptk, ptk_name,
-                                     sta->key_mgmt,
+               sta->pmk_r1_len = sta->pmk_r0_len;
+               if (wpa_pmk_r1_to_ptk(sta->pmk_r1, sta->pmk_r1_len,
+                                     sta->snonce, sta->anonce, sta->addr,
+                                     bss->bssid, sta->pmk_r1_name,
+                                     &ptk, ptk_name, sta->key_mgmt,
                                      sta->pairwise_cipher) < 0 ||
                    check_mic(ptk.kck, ptk.kck_len, sta->key_mgmt, ver, data,
                              len) < 0)

diff --git a/wlantest/rx_mgmt.c b/wlantest/rx_mgmt.c
index a2183a12f9661f9c3687d127bb38f3f83a9b28b1..5eb32f1dad40be42b2174392a43016d0ae870a06 100644 (file)
--- a/wlantest/rx_mgmt.c
+++ b/wlantest/rx_mgmt.c
@@ -232,8 +232,6 @@ static void process_ft_auth(struct wlantest *wt, struct wlantest_bss *bss,
 {
        u16 trans;
        struct wpa_ft_ies parse;
-       u8 pmk_r1[PMK_LEN];
-       u8 pmk_r1_name[WPA_PMK_NAME_LEN];
        struct wpa_ptk ptk;
        u8 ptk_name[WPA_PMK_NAME_LEN];
        struct wlantest_bss *old_bss;
@@ -283,14 +281,15 @@ static void process_ft_auth(struct wlantest *wt, struct wlantest_bss *bss,
                os_memcpy(bss->r1kh_id, parse.r1kh_id, FT_R1KH_ID_LEN);
 
        if (wpa_derive_pmk_r1(sta->pmk_r0, sta->pmk_r0_len, sta->pmk_r0_name,
-                             bss->r1kh_id, sta->addr, pmk_r1, pmk_r1_name) < 0)
+                             bss->r1kh_id, sta->addr, sta->pmk_r1,
+                             sta->pmk_r1_name) < 0)
                return;
-       wpa_hexdump(MSG_DEBUG, "FT: PMKR1Name", pmk_r1_name, WPA_PMK_NAME_LEN);
+       sta->pmk_r1_len = sta->pmk_r0_len;
 
        if (!parse.fte_anonce || !parse.fte_snonce ||
-           wpa_pmk_r1_to_ptk(pmk_r1, PMK_LEN, parse.fte_snonce,
+           wpa_pmk_r1_to_ptk(sta->pmk_r1, sta->pmk_r1_len, parse.fte_snonce,
                              parse.fte_anonce, sta->addr, bss->bssid,
-                             pmk_r1_name, &ptk, ptk_name, sta->key_mgmt,
+                             sta->pmk_r1_name, &ptk, ptk_name, sta->key_mgmt,
                              sta->pairwise_cipher) < 0)
                return;
 
@@ -1127,8 +1126,6 @@ static void rx_mgmt_action_ft_response(struct wlantest *wt,
        const u8 *ies;
        size_t ies_len;
        struct wpa_ft_ies parse;
-       u8 pmk_r1[PMK_LEN];
-       u8 pmk_r1_name[WPA_PMK_NAME_LEN];
        struct wpa_ptk ptk;
        u8 ptk_name[WPA_PMK_NAME_LEN];
 
@@ -1163,9 +1160,10 @@ static void rx_mgmt_action_ft_response(struct wlantest *wt,
                os_memcpy(bss->r1kh_id, parse.r1kh_id, FT_R1KH_ID_LEN);
 
        if (wpa_derive_pmk_r1(sta->pmk_r0, sta->pmk_r0_len, sta->pmk_r0_name,
-                             bss->r1kh_id, sta->addr, pmk_r1, pmk_r1_name) < 0)
+                             bss->r1kh_id, sta->addr, sta->pmk_r1,
+                             sta->pmk_r1_name) < 0)
                return;
-       wpa_hexdump(MSG_DEBUG, "FT: PMKR1Name", pmk_r1_name, WPA_PMK_NAME_LEN);
+       sta->pmk_r1_len = sta->pmk_r0_len;
 
        new_sta = sta_get(bss, sta->addr);
        if (!new_sta)
@@ -1174,11 +1172,15 @@ static void rx_mgmt_action_ft_response(struct wlantest *wt,
        new_sta->pmk_r0_len = sta->pmk_r0_len;
        os_memcpy(new_sta->pmk_r0_name, sta->pmk_r0_name,
                  sizeof(sta->pmk_r0_name));
+       os_memcpy(new_sta->pmk_r1, sta->pmk_r1, sta->pmk_r1_len);
+       new_sta->pmk_r1_len = sta->pmk_r1_len;
+       os_memcpy(new_sta->pmk_r1_name, sta->pmk_r1_name,
+                 sizeof(sta->pmk_r1_name));
        if (!parse.fte_anonce || !parse.fte_snonce ||
-           wpa_pmk_r1_to_ptk(pmk_r1, PMK_LEN, parse.fte_snonce,
+           wpa_pmk_r1_to_ptk(sta->pmk_r1, sta->pmk_r1_len, parse.fte_snonce,
                              parse.fte_anonce, new_sta->addr, bss->bssid,
-                             pmk_r1_name, &ptk, ptk_name, new_sta->key_mgmt,
-                             new_sta->pairwise_cipher) < 0)
+                             sta->pmk_r1_name, &ptk, ptk_name,
+                             new_sta->key_mgmt, new_sta->pairwise_cipher) < 0)
                return;
 
        add_note(wt, MSG_DEBUG, "Derived new PTK");

diff --git a/wlantest/wlantest.h b/wlantest/wlantest.h
index 4de2fe56b338ea4d4232ae72701040049dce3d9d..f7fcd84407717b3b22b3359335aeaa07ee6eb785 100644 (file)
--- a/wlantest/wlantest.h
+++ b/wlantest/wlantest.h
@@ -75,6 +75,9 @@ struct wlantest_sta {
        u8 pmk_r0[PMK_LEN_MAX];
        size_t pmk_r0_len;
        u8 pmk_r0_name[WPA_PMK_NAME_LEN];
+       u8 pmk_r1[PMK_LEN_MAX];
+       size_t pmk_r1_len;
+       u8 pmk_r1_name[WPA_PMK_NAME_LEN];
        struct wpa_ptk ptk; /* Derived PTK */
        int ptk_set;
        struct wpa_ptk tptk; /* Derived PTK during rekeying */