From 5a14d17792be5d8a2cf179613b5f022cfbbf1c7b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 28 Jan 2011 13:48:54 -0600 Subject: [PATCH] libnm-util: remove 802.1x PSK functions and defines There was never a property for it anyway, so it never got serialized across D-Bus, because it was folded into the "password" property in wpa_supplicant between 0.5 and 0.6. --- cli/src/settings.c | 7 ++----- libnm-util/nm-setting-8021x.c | 19 +------------------ libnm-util/nm-setting-8021x.h | 5 +---- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/cli/src/settings.c b/cli/src/settings.c index 35711d9238..fbec9ab34a 100644 --- a/cli/src/settings.c +++ b/cli/src/settings.c @@ -93,8 +93,7 @@ static NmcOutputField nmc_fields_setting_8021X[] = { SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, 20), /* 18 */ SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD, 20), /* 19 */ SETTING_FIELD (NM_SETTING_802_1X_PIN, 8), /* 20 */ - SETTING_FIELD (NM_SETTING_802_1X_PSK, 8), /* 21 */ - SETTING_FIELD (NM_SETTING_802_1X_SYSTEM_CA_CERTS, 17), /* 22 */ + SETTING_FIELD (NM_SETTING_802_1X_SYSTEM_CA_CERTS, 17), /* 21 */ {NULL, NULL, 0, NULL, 0} }; #define NMC_FIELDS_SETTING_802_1X_ALL "name"","\ @@ -118,7 +117,6 @@ static NmcOutputField nmc_fields_setting_8021X[] = { NM_SETTING_802_1X_PHASE2_PRIVATE_KEY","\ NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD","\ NM_SETTING_802_1X_PIN","\ - NM_SETTING_802_1X_PSK","\ NM_SETTING_802_1X_SYSTEM_CA_CERTS #define NMC_FIELDS_SETTING_802_1X_COMMON NMC_FIELDS_SETTING_802_1X_ALL @@ -660,8 +658,7 @@ setting_802_1X_details (NMSetting *setting, NmCli *nmc) nmc->allowed_fields[18].value = phase2_private_key_str; nmc->allowed_fields[19].value = nm_setting_802_1x_get_phase2_private_key_password (s_8021X); nmc->allowed_fields[20].value = nm_setting_802_1x_get_pin (s_8021X); - nmc->allowed_fields[21].value = nm_setting_802_1x_get_psk (s_8021X); - nmc->allowed_fields[22].value = nm_setting_802_1x_get_system_ca_certs (s_8021X) ? _("yes") : _("no"); + nmc->allowed_fields[21].value = nm_setting_802_1x_get_system_ca_certs (s_8021X) ? _("yes") : _("no"); nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index d84318d213..a1096e4021 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -19,7 +19,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2008 Red Hat, Inc. + * (C) Copyright 2007 - 2011 Red Hat, Inc. * (C) Copyright 2007 - 2008 Novell, Inc. */ @@ -126,7 +126,6 @@ typedef struct { GByteArray *phase2_client_cert; char *password; char *pin; - char *psk; GByteArray *private_key; char *private_key_password; GByteArray *phase2_private_key; @@ -156,7 +155,6 @@ enum { PROP_PHASE2_PRIVATE_KEY, PROP_PHASE2_PRIVATE_KEY_PASSWORD, PROP_PIN, - PROP_PSK, PROP_SYSTEM_CA_CERTS, LAST_PROP @@ -1148,21 +1146,6 @@ nm_setting_802_1x_get_pin (NMSetting8021x *setting) return NM_SETTING_802_1X_GET_PRIVATE (setting)->pin; } -/** - * nm_setting_802_1x_get_psk: - * @setting: the #NMSetting8021x - * - * Returns: the Pre-Shared-Key used by the authentication method, if any, as - * specified by the #NMSetting8021x:psk property - **/ -const char * -nm_setting_802_1x_get_psk (NMSetting8021x *setting) -{ - g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL); - - return NM_SETTING_802_1X_GET_PRIVATE (setting)->psk; -} - /** * nm_setting_802_1x_get_private_key_scheme: * @setting: the #NMSetting8021x diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h index 4b31fbf6c1..53dbdd4211 100644 --- a/libnm-util/nm-setting-8021x.h +++ b/libnm-util/nm-setting-8021x.h @@ -19,7 +19,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2009 Red Hat, Inc. + * (C) Copyright 2007 - 2011 Red Hat, Inc. * (C) Copyright 2007 - 2008 Novell, Inc. */ @@ -86,7 +86,6 @@ GQuark nm_setting_802_1x_error_quark (void); #define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key" #define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password" #define NM_SETTING_802_1X_PIN "pin" -#define NM_SETTING_802_1X_PSK "psk" #define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs" /* PRIVATE KEY NOTE: when setting PKCS#12 private keys directly via properties @@ -195,8 +194,6 @@ const char * nm_setting_802_1x_get_password (NMSetting8 const char * nm_setting_802_1x_get_pin (NMSetting8021x *setting); -const char * nm_setting_802_1x_get_psk (NMSetting8021x *setting); - NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme (NMSetting8021x *setting); const GByteArray * nm_setting_802_1x_get_private_key_blob (NMSetting8021x *setting); const char * nm_setting_802_1x_get_private_key_path (NMSetting8021x *setting);