projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix PNO restart flow
[mech_eap.git]
/
wpa_supplicant
/
ibss_rsn.c
diff --git
a/wpa_supplicant/ibss_rsn.c
b/wpa_supplicant/ibss_rsn.c
index
c00db31
..
53d7d57
100644
(file)
--- a/
wpa_supplicant/ibss_rsn.c
+++ b/
wpa_supplicant/ibss_rsn.c
@@
-221,6
+221,7
@@
static int ibss_rsn_supp_init(struct ibss_rsn_peer *peer, const u8 *own_addr,
peer->supp = wpa_sm_init(ctx);
if (peer->supp == NULL) {
wpa_printf(MSG_DEBUG, "SUPP: wpa_sm_init() failed");
peer->supp = wpa_sm_init(ctx);
if (peer->supp == NULL) {
wpa_printf(MSG_DEBUG, "SUPP: wpa_sm_init() failed");
+ os_free(ctx);
return -1;
}
return -1;
}
@@
-404,7
+405,7
@@
static void auth_set_eapol(void *ctx, const u8 *addr,
static int ibss_rsn_auth_init_group(struct ibss_rsn *ibss_rsn,
static int ibss_rsn_auth_init_group(struct ibss_rsn *ibss_rsn,
- const u8 *own_addr)
+ const u8 *own_addr
, struct wpa_ssid *ssid
)
{
struct wpa_auth_config conf;
struct wpa_auth_callbacks cb;
{
struct wpa_auth_config conf;
struct wpa_auth_callbacks cb;
@@
-418,7
+419,7
@@
static int ibss_rsn_auth_init_group(struct ibss_rsn *ibss_rsn,
conf.rsn_pairwise = WPA_CIPHER_CCMP;
conf.wpa_group = WPA_CIPHER_CCMP;
conf.eapol_version = 2;
conf.rsn_pairwise = WPA_CIPHER_CCMP;
conf.wpa_group = WPA_CIPHER_CCMP;
conf.eapol_version = 2;
- conf.wpa_group_rekey = 600;
+ conf.wpa_group_rekey =
ssid->group_rekey ? ssid->group_rekey :
600;
os_memset(&cb, 0, sizeof(cb));
cb.ctx = ibss_rsn;
os_memset(&cb, 0, sizeof(cb));
cb.ctx = ibss_rsn;
@@
-665,7
+666,8
@@
void ibss_rsn_stop(struct ibss_rsn *ibss_rsn, const u8 *peermac)
}
}
-struct ibss_rsn * ibss_rsn_init(struct wpa_supplicant *wpa_s)
+struct ibss_rsn * ibss_rsn_init(struct wpa_supplicant *wpa_s,
+ struct wpa_ssid *ssid)
{
struct ibss_rsn *ibss_rsn;
{
struct ibss_rsn *ibss_rsn;
@@
-674,7
+676,7
@@
struct ibss_rsn * ibss_rsn_init(struct wpa_supplicant *wpa_s)
return NULL;
ibss_rsn->wpa_s = wpa_s;
return NULL;
ibss_rsn->wpa_s = wpa_s;
- if (ibss_rsn_auth_init_group(ibss_rsn, wpa_s->own_addr) < 0) {
+ if (ibss_rsn_auth_init_group(ibss_rsn, wpa_s->own_addr
, ssid
) < 0) {
ibss_rsn_deinit(ibss_rsn);
return NULL;
}
ibss_rsn_deinit(ibss_rsn);
return NULL;
}