gsupplicant: Add ciphers only for WPA PSK and EAP
authorSamuel Ortiz <sameo@linux.intel.com>
Wed, 2 Feb 2011 23:51:08 +0000 (00:51 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Wed, 2 Feb 2011 23:51:08 +0000 (00:51 +0100)
gsupplicant/supplicant.c

index 97e5858..7a3fd4c 100644 (file)
@@ -2773,17 +2773,17 @@ static void add_network_security(DBusMessageIter *dict, GSupplicantSSID *ssid)
        case G_SUPPLICANT_SECURITY_PSK:
                key_mgmt = "WPA-PSK";
                add_network_security_psk(dict, ssid);
+               add_network_security_ciphers(dict, ssid);
                add_network_security_proto(dict, ssid);
                break;
        case G_SUPPLICANT_SECURITY_IEEE8021X:
                key_mgmt = "WPA-EAP";
                add_network_security_eap(dict, ssid);
+               add_network_security_ciphers(dict, ssid);
                add_network_security_proto(dict, ssid);
                break;
        }
 
-       add_network_security_ciphers(dict, ssid);
-
        supplicant_dbus_dict_append_basic(dict, "key_mgmt",
                                DBUS_TYPE_STRING, &key_mgmt);
 }