From 6bd0fce1c99267da03bcaff48b99be599667c4e4 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 12 Jan 2009 10:31:00 -0500 Subject: [PATCH] libnm-util: validate PSK and LEAP passwords If they exist, they shouldn't be zero-length. --- libnm-util/nm-setting-wireless-security.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 9f1604855..f9c6ac020 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -590,6 +590,13 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); return FALSE; } + if (priv->leap_password && !strlen (priv->leap_password)) { + g_set_error (error, + NM_SETTING_WIRELESS_SECURITY_ERROR, + NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, + NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD); + return FALSE; + } } else { if ( (strcmp (priv->key_mgmt, "ieee8021x") == 0) || (strcmp (priv->key_mgmt, "wpa-eap") == 0)) { @@ -657,6 +664,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) return FALSE; } + if (priv->psk && !strlen (priv->psk)) { + g_set_error (error, + NM_SETTING_WIRELESS_SECURITY_ERROR, + NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, + NM_SETTING_WIRELESS_SECURITY_PSK); + return FALSE; + } + if (priv->proto && !_nm_utils_string_slist_validate (priv->proto, valid_protos)) { g_set_error (error, NM_SETTING_WIRELESS_SECURITY_ERROR,