From ef8c94683dbf474e241e45719e01a7e7683cea8a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 9 Nov 2007 16:21:24 +0000 Subject: [PATCH] Group phase2 private key with phase1 private key git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3075 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- libnm-util/nm-setting-wireless-security.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnm-util/nm-setting-wireless-security.h b/libnm-util/nm-setting-wireless-security.h index fe4d4cb079..a8024c50a8 100644 --- a/libnm-util/nm-setting-wireless-security.h +++ b/libnm-util/nm-setting-wireless-security.h @@ -39,8 +39,7 @@ 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_DECRYPTED "phase2-private-key-passwd" -#define NM_SETTING_WIRELESS_SECURITY_PHASE2_PRIVATE_KEY_PASSWD "phase2-private-key-decrypted" +#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" @@ -51,6 +50,7 @@ G_BEGIN_DECLS #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" typedef struct { NMSetting parent;