From 46cac7cfaf1a4f67b8613efe6982644763a67523 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 8 Nov 2007 19:27:28 +0000 Subject: [PATCH] 2007-11-08 Dan Williams * libnm-util/nm-setting-wireless-security.h libnm-util/nm-setting-wireless-security.c - Add 'private-key-decrypted' and 'phase2-private-key-decrypted' members to 802-11-wireless-security structure. This should be used to indicate that the values in private-key and phase2-private-key are already decrypted by the user agent, and that no private-key-passwd or phase2-private-key-passwd should be expected. It is not meant to be a stored configuration value, but meant to be set when the conneciton is sent to NM over dbus. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3073 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 12 +++++++++ libnm-util/nm-setting-wireless-security.c | 30 +++++++++++++++++++++++ libnm-util/nm-setting-wireless-security.h | 6 ++++- 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d1940685e0..235435da1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-11-08 Dan Williams + + * libnm-util/nm-setting-wireless-security.h + libnm-util/nm-setting-wireless-security.c + - Add 'private-key-decrypted' and 'phase2-private-key-decrypted' + members to 802-11-wireless-security structure. This should be used + to indicate that the values in private-key and phase2-private-key + are already decrypted by the user agent, and that no + private-key-passwd or phase2-private-key-passwd should be expected. + It is not meant to be a stored configuration value, but meant to + be set when the conneciton is sent to NM over dbus. + 2007-11-08 Dan Williams * libnm-util/nm-connection.h diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 133dde084a..92f1c4066f 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -24,6 +24,7 @@ enum { PROP_CA_PATH, PROP_CLIENT_CERT, PROP_PRIVATE_KEY, + PROP_PRIVATE_KEY_DECRYPTED, PROP_PHASE1_PEAPVER, PROP_PHASE1_PEAPLABEL, PROP_PHASE1_FAST_PROVISIONING, @@ -33,6 +34,7 @@ enum { PROP_PHASE2_CA_PATH, PROP_PHASE2_CLIENT_CERT, PROP_PHASE2_PRIVATE_KEY, + PROP_PHASE2_PRIVATE_KEY_DECRYPTED, PROP_PHASE2_PRIVATE_KEY_PASSWD, PROP_NAI, PROP_WEP_KEY0, @@ -500,6 +502,9 @@ set_property (GObject *object, guint prop_id, g_byte_array_free (setting->private_key, TRUE); setting->private_key = g_value_dup_boxed (value); break; + case PROP_PRIVATE_KEY_DECRYPTED: + setting->private_key_decrypted = g_value_get_boolean (value); + break; case PROP_PHASE1_PEAPVER: g_free (setting->phase1_peapver); setting->phase1_peapver = g_value_dup_string (value); @@ -539,6 +544,9 @@ set_property (GObject *object, guint prop_id, g_byte_array_free (setting->phase2_private_key, TRUE); setting->phase2_private_key = g_value_dup_boxed (value); break; + case PROP_PHASE2_PRIVATE_KEY_DECRYPTED: + setting->phase2_private_key_decrypted = g_value_get_boolean (value); + break; case PROP_PHASE2_PRIVATE_KEY_PASSWD: g_free (setting->phase2_private_key_passwd); setting->phase2_private_key_passwd = g_value_dup_string (value); @@ -635,6 +643,9 @@ get_property (GObject *object, guint prop_id, case PROP_PRIVATE_KEY: g_value_set_boxed (value, setting->private_key); break; + case PROP_PRIVATE_KEY_DECRYPTED: + g_value_set_boolean (value, setting->private_key_decrypted); + break; case PROP_PHASE1_PEAPVER: g_value_set_string (value, setting->phase1_peapver); break; @@ -662,6 +673,9 @@ get_property (GObject *object, guint prop_id, case PROP_PHASE2_PRIVATE_KEY: g_value_set_boxed (value, setting->phase2_private_key); break; + case PROP_PHASE2_PRIVATE_KEY_DECRYPTED: + g_value_set_boolean (value, setting->phase2_private_key_decrypted); + break; case PROP_PHASE2_PRIVATE_KEY_PASSWD: g_value_set_string (value, setting->phase2_private_key_passwd); break; @@ -820,6 +834,14 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting DBUS_TYPE_G_UCHAR_ARRAY, G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + g_object_class_install_property + (object_class, PROP_PRIVATE_KEY_DECRYPTED, + g_param_spec_boolean (NM_SETTING_WIRELESS_SECURITY_PRIVATE_KEY_DECRYPTED, + "Private key decrypted", + "Private key decrypted", + FALSE, + G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + g_object_class_install_property (object_class, PROP_PHASE1_PEAPVER, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_PHASE1_PEAPVER, @@ -892,6 +914,14 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting DBUS_TYPE_G_UCHAR_ARRAY, G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + g_object_class_install_property + (object_class, PROP_PHASE2_PRIVATE_KEY_DECRYPTED, + g_param_spec_boolean (NM_SETTING_WIRELESS_SECURITY_PHASE2_PRIVATE_KEY_DECRYPTED, + "Phase2 private key decrypted", + "Phase2 private key decrypted", + FALSE, + G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + g_object_class_install_property (object_class, PROP_PHASE2_PRIVATE_KEY_PASSWD, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_PHASE2_PRIVATE_KEY_PASSWD, diff --git a/libnm-util/nm-setting-wireless-security.h b/libnm-util/nm-setting-wireless-security.h index fa5c0b6847..fe4d4cb079 100644 --- a/libnm-util/nm-setting-wireless-security.h +++ b/libnm-util/nm-setting-wireless-security.h @@ -29,6 +29,7 @@ G_BEGIN_DECLS #define NM_SETTING_WIRELESS_SECURITY_CA_PATH "ca-path" #define NM_SETTING_WIRELESS_SECURITY_CLIENT_CERT "client-cert" #define NM_SETTING_WIRELESS_SECURITY_PRIVATE_KEY "private-key" +#define NM_SETTING_WIRELESS_SECURITY_PRIVATE_KEY_DECRYPTED "private-key-decrypted" #define NM_SETTING_WIRELESS_SECURITY_PHASE1_PEAPVER "phase1-peapver" #define NM_SETTING_WIRELESS_SECURITY_PHASE1_PEAPLABEL "phase1-peaplabel" #define NM_SETTING_WIRELESS_SECURITY_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning" @@ -38,7 +39,8 @@ G_BEGIN_DECLS #define NM_SETTING_WIRELESS_SECURITY_PHASE2_CA_PATH "phase2-ca-path" #define NM_SETTING_WIRELESS_SECURITY_PHASE2_CLIENT_CERT "phase2-client-cert" #define NM_SETTING_WIRELESS_SECURITY_PHASE2_PRIVATE_KEY "phase2-private-key" -#define NM_SETTING_WIRELESS_SECURITY_PHASE2_PRIVATE_KEY_PASSWD "phase2-private-key-passwd" +#define NM_SETTING_WIRELESS_SECURITY_PHASE2_PRIVATE_KEY_DECRYPTED "phase2-private-key-passwd" +#define NM_SETTING_WIRELESS_SECURITY_PHASE2_PRIVATE_KEY_PASSWD "phase2-private-key-decrypted" #define NM_SETTING_WIRELESS_SECURITY_NAI "nai" #define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0" #define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1" @@ -66,6 +68,7 @@ typedef struct { char *ca_path; GByteArray *client_cert; GByteArray *private_key; + gboolean private_key_decrypted; char *phase1_peapver; char *phase1_peaplabel; char *phase1_fast_provisioning; @@ -74,6 +77,7 @@ typedef struct { GByteArray *phase2_ca_cert; char *phase2_ca_path; GByteArray *phase2_client_cert; + gboolean phase2_private_key_decrypted; GByteArray *phase2_private_key; char *nai; char *wep_key0;