aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/ibss_rsn.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-11-29 16:31:16 (GMT)
committerJouni Malinen <j@w1.fi>2009-11-29 16:31:16 (GMT)
commitea038e0da4045db709f6ea6a2e92b0cb4eb59f97 (patch)
treeac7a8af532d5b465a7c5ea9b7db90e6f861a9c8d /wpa_supplicant/ibss_rsn.c
parent3acb50056cf3e9e3f4a9776d5f2cbdf75fe0ae8c (diff)
downloadhostap-ea038e0da4045db709f6ea6a2e92b0cb4eb59f97.zip
hostap-ea038e0da4045db709f6ea6a2e92b0cb4eb59f97.tar.gz
hostap-ea038e0da4045db709f6ea6a2e92b0cb4eb59f97.tar.bz2
Fix IBSS RSN build
Diffstat (limited to 'wpa_supplicant/ibss_rsn.c')
-rw-r--r--wpa_supplicant/ibss_rsn.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/wpa_supplicant/ibss_rsn.c b/wpa_supplicant/ibss_rsn.c
index 79878b5..e0e0f3b 100644
--- a/wpa_supplicant/ibss_rsn.c
+++ b/wpa_supplicant/ibss_rsn.c
@@ -19,6 +19,7 @@
#include "wpa_supplicant_i.h"
#include "rsn_supp/wpa.h"
#include "rsn_supp/wpa_ie.h"
+#include "driver_i.h"
#include "../hostapd/wpa.h"
#include "ibss_rsn.h"
@@ -235,28 +236,13 @@ static int auth_send_eapol(void *ctx, const u8 *addr, const u8 *data,
}
-static int auth_set_key(void *ctx, int vlan_id, const char *_alg,
- const u8 *addr, int idx, u8 *key,
- size_t key_len)
+static int auth_set_key(void *ctx, int vlan_id, wpa_alg alg, const u8 *addr,
+ int idx, u8 *key, size_t key_len)
{
struct ibss_rsn *ibss_rsn = ctx;
u8 seq[6];
- wpa_alg alg;
os_memset(seq, 0, sizeof(seq));
- if (os_strcmp(_alg, "none") == 0)
- alg = WPA_ALG_NONE;
- else if (os_strcmp(_alg, "WEP") == 0)
- alg = WPA_ALG_WEP;
- else if (os_strcmp(_alg, "TKIP") == 0)
- alg = WPA_ALG_TKIP;
- else if (os_strcmp(_alg, "CCMP") == 0)
- alg = WPA_ALG_CCMP;
- else if (os_strcmp(_alg, "IGTK") == 0)
- alg = WPA_ALG_IGTK;
- else
- return -1;
-
if (idx == 0) {
/*
* In IBSS RSN, the pairwise key from the 4-way handshake