Updated through tag hostap_2_5 from git://w1.fi/hostap.git

[mech_eap.git] / libeap / src / rsn_supp / peerkey.h

diff --git a/libeap/src/rsn_supp/peerkey.h b/libeap/src/rsn_supp/peerkey.h
index 2613127..6ccd948 100644 (file)
--- a/libeap/src/rsn_supp/peerkey.h
+++ b/libeap/src/rsn_supp/peerkey.h
@@ -1,15 +1,9 @@
 /*
  * WPA Supplicant - PeerKey for Direct Link Setup (DLS)
- * Copyright (c) 2006-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2006-2015, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #ifndef PEERKEY_H
@@ -30,11 +24,10 @@ struct wpa_peerkey {
        int smk_complete;
        u8 smkid[PMKID_LEN];
        u32 lifetime;
-       os_time_t expiration;
        int cipher; /* Selected cipher (WPA_CIPHER_*) */
        u8 replay_counter[WPA_REPLAY_COUNTER_LEN];
        int replay_counter_set;
-       int use_sha256; /* whether AKMP indicate SHA256-based derivations */
+       int akmp;
 
        struct wpa_ptk stk, tstk;
        int stk_set, tstk_set;
@@ -45,10 +38,11 @@ struct wpa_peerkey {
 
 int peerkey_verify_eapol_key_mic(struct wpa_sm *sm,
                                 struct wpa_peerkey *peerkey,
-                                struct wpa_eapol_key *key, u16 ver,
+                                struct wpa_eapol_key_192 *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);
+                          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, size_t extra_len,
                          u16 key_info, u16 ver);
@@ -67,7 +61,8 @@ peerkey_verify_eapol_key_mic(struct wpa_sm *sm,
 
 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)
+                     struct wpa_eapol_key *key, u16 key_info, u16 ver,
+                     const u8 *key_data, size_t key_data_len)
 {
 }