From: Johannes Berg Date: Sun, 11 Dec 2011 17:57:50 +0000 (+0200) Subject: IBSS: fix RSN key initialisation X-Git-Tag: aosp-jb-start~145 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=457a126e298895682b5e9a0bbec60e2fa3aa16e5;p=thirdparty%2Fhostap.git IBSS: fix RSN key initialisation Antonio reported that RSN IBSS failed to work. We traced it down to a GTK failure, and he then bisected it to commit bdffdc5ddb0c838af4c90d11: "AP: Reorder WPA/Beacon initialization". The reason this commit broke it is that the state machine's GInit variable is never set to false as wpa_init_keys() never gets called, and thus new keys are generated every time the state machine executes. Fix this by calling wpa_init_keys() when the new group has been initialised. Reported-by: Antonio Quartulli Tested-by: Antonio Quartulli Signed-hostap: Johannes Berg --- diff --git a/wpa_supplicant/ibss_rsn.c b/wpa_supplicant/ibss_rsn.c index 4bab9066f..d4fa39d74 100644 --- a/wpa_supplicant/ibss_rsn.c +++ b/wpa_supplicant/ibss_rsn.c @@ -339,6 +339,8 @@ static int ibss_rsn_auth_init_group(struct ibss_rsn *ibss_rsn, return -1; } + wpa_init_keys(ibss_rsn->auth_group); + return 0; }