2007-11-12 Dan Williams <dcbw@redhat.com>

	Make certs actually work.  The private key is now a secret, and should be
	decrypted when requested by NM.  The private key and phase2 private key
	passwords are no longer interesting to NM because they should be used by
	the settings service to decrypt the private key itself before passing it
	to NM, and hence have been removed as fields.

	* libnm-util/nm-setting-wireless-security.h
	  libnm-util/nm-setting-wireless-security.c
		- Remove private-key-passwd and phase2-private-key-passwd from
			properties
		- (need_secrets_password, need_secrets_eappsk, need_secrets_sim,
		   need_secrets): use property #defines instead strings to keep things
			consistent
		- (need_secrets_tls): if a client certificate is present but no
			private key, request the private key
		- (set_property, get_property, nm_setting_wireless_security_class_init):
			remove private key password stuff, mark private keys as secret

	* src/supplicant-manager/nm-supplicant-settings-verify.c
		- Remove private_key_passwd and private_key2_passwd from opt_table



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3080 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

1 files changed, 4 insertions, 12 deletions

diff --git a/libnm-util/nm-setting-wireless-security.h b/libnm-util/nm-setting-wireless-security.h
index a8024c50a8..eeeac2cded 100644
--- a/libnm-util/nm-setting-wireless-security.h
+++ b/libnm-util/nm-setting-wireless-security.h
@@ -28,8 +28,6 @@ G_BEGIN_DECLS
 #define NM_SETTING_WIRELESS_SECURITY_CA_CERT "ca-cert"
 #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,8 +36,6 @@ G_BEGIN_DECLS
 #define NM_SETTING_WIRELESS_SECURITY_PHASE2_CA_CERT "phase2-ca-cert"
 #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_DECRYPTED "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"
@@ -49,8 +45,8 @@ G_BEGIN_DECLS
 #define NM_SETTING_WIRELESS_SECURITY_PASSWORD "password"
 #define NM_SETTING_WIRELESS_SECURITY_PIN "pin"
 #define NM_SETTING_WIRELESS_SECURITY_EAPPSK "eappsk"
-#define NM_SETTING_WIRELESS_SECURITY_PRIVATE_KEY_PASSWD "private-key-passwd"
-#define NM_SETTING_WIRELESS_SECURITY_PHASE2_PRIVATE_KEY_PASSWD "phase2-private-key-passwd"
+#define NM_SETTING_WIRELESS_SECURITY_PRIVATE_KEY "private-key"
+#define NM_SETTING_WIRELESS_SECURITY_PHASE2_PRIVATE_KEY "phase2-private-key"
 
 typedef struct {
 	NMSetting parent;
@@ -67,8 +63,6 @@ typedef struct {
 	GByteArray *ca_cert;
 	char *ca_path;
 	GByteArray *client_cert;
-	GByteArray *private_key;
-	gboolean private_key_decrypted;
 	char *phase1_peapver;
 	char *phase1_peaplabel;
 	char *phase1_fast_provisioning;
@@ -77,8 +71,6 @@ 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;
 	char *wep_key1;
@@ -88,8 +80,8 @@ typedef struct {
 	char *password;
 	char *pin;
 	char *eappsk;
-	char *private_key_passwd;
-	char *phase2_private_key_passwd;
+	GByteArray *private_key;
+	GByteArray *phase2_private_key;
 } NMSettingWirelessSecurity;
 
 typedef struct {