From c3ece5044631c095cc72da254acddaf90930463a Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 18 Dec 2008 20:03:24 +0200 Subject: [PATCH] Fixed PSK editing in wpa_gui (copy-paste bug in field names) --- wpa_supplicant/ChangeLog | 1 + wpa_supplicant/wpa_gui-qt4/networkconfig.cpp | 2 +- wpa_supplicant/wpa_gui/networkconfig.ui.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog index 14ad8ceb9..d320c7c99 100644 --- a/wpa_supplicant/ChangeLog +++ b/wpa_supplicant/ChangeLog @@ -14,6 +14,7 @@ ChangeLog for wpa_supplicant * added support for using driver_test over UDP socket * fixed PEAPv0 Cryptobinding interoperability issue with Windows Server 2008 NPS; optional cryptobinding is now enabled (again) by default + * fixed PSK editing in wpa_gui 2008-11-23 - v0.6.6 * added Milenage SIM/USIM emulator for EAP-SIM/EAP-AKA diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp index a176d056e..8d5d23b5d 100644 --- a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp +++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp @@ -278,7 +278,7 @@ void NetworkConfig::addNetwork() setNetworkParam(id, "group", "TKIP CCMP WEP104 WEP40", false); } if (pskEdit->isEnabled() && - strcmp(passwordEdit->text().toAscii().constData(), + strcmp(pskEdit->text().toAscii().constData(), WPA_GUI_KEY_DATA) != 0) setNetworkParam(id, "psk", pskEdit->text().toAscii().constData(), diff --git a/wpa_supplicant/wpa_gui/networkconfig.ui.h b/wpa_supplicant/wpa_gui/networkconfig.ui.h index 8259bfc7e..501d5d265 100644 --- a/wpa_supplicant/wpa_gui/networkconfig.ui.h +++ b/wpa_supplicant/wpa_gui/networkconfig.ui.h @@ -179,7 +179,7 @@ void NetworkConfig::addNetwork() setNetworkParam(id, "group", "TKIP CCMP WEP104 WEP40", false); } if (pskEdit->isEnabled() && - strcmp(passwordEdit->text().ascii(), WPA_GUI_KEY_DATA) != 0) + strcmp(pskEdit->text().ascii(), WPA_GUI_KEY_DATA) != 0) setNetworkParam(id, "psk", pskEdit->text().ascii(), psklen != 64); if (eapSelect->isEnabled()) setNetworkParam(id, "eap", eapSelect->currentText().ascii(), false);