28fb9bb195
Commit 6d014ffc6e ('Make struct
wpa_eapol_key easier to use with variable length MIC') forgot to update
number of EAPOL-Key processing steps for SMK and STK exchanges and broke
PeerKey. Fix this by updating the Key Data field pointers to match the
new style with variable length Key MIC field.
Signed-off-by: Jouni Malinen <j@w1.fi>
82 lines
2.2 KiB
C
82 lines
2.2 KiB
C
/*
|
|
* WPA Supplicant - PeerKey for Direct Link Setup (DLS)
|
|
* Copyright (c) 2006-2015, Jouni Malinen <j@w1.fi>
|
|
*
|
|
* This software may be distributed under the terms of the BSD license.
|
|
* See README for more details.
|
|
*/
|
|
|
|
#ifndef PEERKEY_H
|
|
#define PEERKEY_H
|
|
|
|
#define PEERKEY_MAX_IE_LEN 80
|
|
struct wpa_peerkey {
|
|
struct wpa_peerkey *next;
|
|
int initiator; /* whether this end was initator for SMK handshake */
|
|
u8 addr[ETH_ALEN]; /* other end MAC address */
|
|
u8 inonce[WPA_NONCE_LEN]; /* Initiator Nonce */
|
|
u8 pnonce[WPA_NONCE_LEN]; /* Peer Nonce */
|
|
u8 rsnie_i[PEERKEY_MAX_IE_LEN]; /* Initiator RSN IE */
|
|
size_t rsnie_i_len;
|
|
u8 rsnie_p[PEERKEY_MAX_IE_LEN]; /* Peer RSN IE */
|
|
size_t rsnie_p_len;
|
|
u8 smk[PMK_LEN];
|
|
int smk_complete;
|
|
u8 smkid[PMKID_LEN];
|
|
u32 lifetime;
|
|
int cipher; /* Selected cipher (WPA_CIPHER_*) */
|
|
u8 replay_counter[WPA_REPLAY_COUNTER_LEN];
|
|
int replay_counter_set;
|
|
int akmp;
|
|
|
|
struct wpa_ptk stk, tstk;
|
|
int stk_set, tstk_set;
|
|
};
|
|
|
|
|
|
#ifdef CONFIG_PEERKEY
|
|
|
|
int peerkey_verify_eapol_key_mic(struct wpa_sm *sm,
|
|
struct wpa_peerkey *peerkey,
|
|
struct wpa_eapol_key *key, u16 ver,
|
|
const u8 *buf, size_t len);
|
|
void peerkey_rx_eapol_4way(struct wpa_sm *sm, struct wpa_peerkey *peerkey,
|
|
struct wpa_eapol_key *key, u16 key_info, u16 ver,
|
|
const u8 *key_data, size_t key_data_len);
|
|
void peerkey_rx_eapol_smk(struct wpa_sm *sm, const u8 *src_addr,
|
|
struct wpa_eapol_key *key, const u8 *key_data,
|
|
size_t key_data_len, u16 key_info, u16 ver);
|
|
void peerkey_deinit(struct wpa_sm *sm);
|
|
|
|
#else /* CONFIG_PEERKEY */
|
|
|
|
static inline int
|
|
peerkey_verify_eapol_key_mic(struct wpa_sm *sm,
|
|
struct wpa_peerkey *peerkey,
|
|
struct wpa_eapol_key *key, u16 ver,
|
|
const u8 *buf, size_t len)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
static inline void
|
|
peerkey_rx_eapol_4way(struct wpa_sm *sm, struct wpa_peerkey *peerkey,
|
|
struct wpa_eapol_key *key, u16 key_info, u16 ver,
|
|
const u8 *key_data, size_t key_data_len)
|
|
{
|
|
}
|
|
|
|
static inline void
|
|
peerkey_rx_eapol_smk(struct wpa_sm *sm, const u8 *src_addr,
|
|
struct wpa_eapol_key *key, const u8 *key_data,
|
|
size_t key_data_len, u16 key_info, u16 ver)
|
|
{
|
|
}
|
|
|
|
static inline void peerkey_deinit(struct wpa_sm *sm)
|
|
{
|
|
}
|
|
|
|
#endif /* CONFIG_PEERKEY */
|
|
|
|
#endif /* PEERKEY_H */
|