diff options
| author | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:30 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:30 +0100 |
| commit | 02d69323d320e0df4d7daa6115ee1ac1239b1a58 (patch) | |
| tree | b83a6b9a01b302117d31476361971212f9fd1750 /libnm-util/nm-setting-wireless-security.c | |
| parent | d31839fb4152978db9734e24c00fbac4f42debb7 (diff) | |
| parent | 9c202e3e860b3be9e1f8882630b69affbb130102 (diff) | |
Merge tag 'upstream/0.9.7.995' into experimental
Upstream version 0.9.7.995
Diffstat (limited to 'libnm-util/nm-setting-wireless-security.c')
| -rw-r--r-- | libnm-util/nm-setting-wireless-security.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 336773c8..404a38ad 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -25,7 +25,6 @@ #include <config.h> #include <string.h> -#include <ctype.h> #include <dbus/dbus-glib.h> #include "nm-setting-wireless-security.h" #include "nm-setting-8021x.h" @@ -76,7 +75,12 @@ nm_setting_wireless_security_error_quark (void) } -G_DEFINE_TYPE (NMSettingWirelessSecurity, nm_setting_wireless_security, NM_TYPE_SETTING) +G_DEFINE_TYPE_WITH_CODE (NMSettingWirelessSecurity, nm_setting_wireless_security, NM_TYPE_SETTING, + _nm_register_setting (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, + g_define_type_id, + 2, + NM_SETTING_WIRELESS_SECURITY_ERROR)) +NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_WIRELESS_SECURITY) #define NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIRELESS_SECURITY, NMSettingWirelessSecurityPrivate)) @@ -704,13 +708,13 @@ verify_wep_key (const char *key, NMWepKeyType wep_type) if (keylen == 10 || keylen == 26) { /* Hex key */ for (i = 0; i < keylen; i++) { - if (!isxdigit (key[i])) + if (!g_ascii_isxdigit (key[i])) return FALSE; } } else if (keylen == 5 || keylen == 13) { /* ASCII key */ for (i = 0; i < keylen; i++) { - if (!isascii (key[i])) + if (!g_ascii_isprint (key[i])) return FALSE; } } else @@ -739,7 +743,7 @@ verify_wpa_psk (const char *psk) if (psklen == 64) { /* Hex PSK */ for (i = 0; i < psklen; i++) { - if (!isxdigit (psk[i])) + if (!g_ascii_isxdigit (psk[i])) return FALSE; } } |