@@ -39,15 +39,15 @@

Synopsis

+ #include <nm-setting-8021x.h>
 
 enum                NMSetting8021xCKFormat;
 enum                NMSetting8021xCKScheme;
 #define             NM_SETTING_802_1X_SETTING_NAME
-enum                NMSetting8021xError;
+enum                NMSetting8021xError;
 #define             NM_TYPE_SETTING_802_1X_ERROR
 #define             NM_SETTING_802_1X_ERROR
 GQuark              nm_setting_802_1x_error_quark       (void);
@@ -66,15 +66,12 @@ enum                NM_SETTING_802_1X_PHASE2_CA_PATH
 #define             NM_SETTING_802_1X_PHASE2_CLIENT_CERT
 #define             NM_SETTING_802_1X_PASSWORD
-#define             NM_SETTING_802_1X_PASSWORD_FLAGS
 #define             NM_SETTING_802_1X_PRIVATE_KEY
 #define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
-#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
 #define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY
 #define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD
-#define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
 #define             NM_SETTING_802_1X_PIN
-#define             NM_SETTING_802_1X_PIN_FLAGS
+#define             NM_SETTING_802_1X_PSK
 #define             NM_SETTING_802_1X_SYSTEM_CA_CERTS
                     NMSetting8021x;
                     NMSetting8021xClass;
@@ -99,10 +96,8 @@ const char *        NMSetting8021x *setting);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_ca_cert_blob
-                                                        (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_ca_cert_path
-                                                        (NMSetting8021x *setting);
+const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
                                                          const char *value,
                                                          NMSetting8021xCKScheme scheme,
@@ -110,9 +105,9 @@ const char *            GError **error);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_client_cert_blob
+const GByteArray *  nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_client_cert_path
+const char *        nm_setting_802_1x_get_client_cert_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
                                                          const char *value,
@@ -130,9 +125,9 @@ const char *        NMSetting8021x *setting);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_phase2_ca_cert_blob
+const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert_blob
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_phase2_ca_cert_path
+const char *        nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_phase2_ca_cert
                                                         (NMSetting8021x *setting,
@@ -142,9 +137,9 @@ const char *            GError **error);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_phase2_client_cert_blob
+const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_phase2_client_cert_path
+const char *        nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_phase2_client_cert
                                                         (NMSetting8021x *setting,
@@ -153,15 +148,13 @@ const char *            NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
-NMSettingSecretFlags  nm_setting_802_1x_get_password_flags
-                                                        (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);
-NMSettingSecretFlags  nm_setting_802_1x_get_pin_flags   (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
+const GByteArray *  nm_setting_802_1x_get_private_key_blob
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_private_key_path
+const char *        nm_setting_802_1x_get_private_key_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
                                                          const char *value,
@@ -169,17 +162,15 @@ const char *            NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
-const char *            nm_setting_802_1x_get_private_key_password
-                                                        (NMSetting8021x *setting);
-NMSettingSecretFlags  nm_setting_802_1x_get_private_key_password_flags
+const char *        nm_setting_802_1x_get_private_key_password
                                                         (NMSetting8021x *setting);
 NMSetting8021xCKFormat  nm_setting_802_1x_get_private_key_format
                                                         (NMSetting8021x *setting);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_phase2_private_key_blob
+const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_phase2_private_key_path
+const char *        nm_setting_802_1x_get_phase2_private_key_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_phase2_private_key
                                                         (NMSetting8021x *setting,
@@ -188,27 +179,67 @@ const char *            NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
-const char *            nm_setting_802_1x_get_phase2_private_key_password
-                                                        (NMSetting8021x *setting);
-NMSettingSecretFlags  nm_setting_802_1x_get_phase2_private_key_password_flags
+const char *        nm_setting_802_1x_get_phase2_private_key_password
                                                         (NMSetting8021x *setting);
 NMSetting8021xCKFormat  nm_setting_802_1x_get_phase2_private_key_format
                                                         (NMSetting8021x *setting);
+enum                NMSetting8021xCKType;
+const GByteArray *  nm_setting_802_1x_get_ca_cert       (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_ca_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+const GByteArray *  nm_setting_802_1x_get_client_cert   (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_client_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert
+                                                        (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_phase2_ca_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+const GByteArray *  nm_setting_802_1x_get_phase2_client_cert
+                                                        (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_phase2_client_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+const GByteArray *  nm_setting_802_1x_get_private_key   (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_private_key_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         const char *password,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+NMSetting8021xCKType  nm_setting_802_1x_get_private_key_type
+                                                        (NMSetting8021x *setting);
+const GByteArray *  nm_setting_802_1x_get_phase2_private_key
+                                                        (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_phase2_private_key_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         const char *password,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+NMSetting8021xCKType  nm_setting_802_1x_get_phase2_private_key_type
+                                                        (NMSetting8021x *setting);

Object Hierarchy

-  GEnum
-   +----NMSetting8021xError
-

   GObject
    +----NMSetting
          +----NMSetting8021x

Properties

   "anonymous-identity"       gchar*                : Read / Write
@@ -218,7 +249,6 @@ const char *            eap"                      GSList_gchararray_*   : Read / Write
   "identity"                 gchar*                : Read / Write
   "password"                 gchar*                : Read / Write
-  "password-flags"           guint                 : Read / Write
   "phase1-fast-provisioning" gchar*                : Read / Write
   "phase1-peaplabel"         gchar*                : Read / Write
   "phase1-peapver"           gchar*                : Read / Write
@@ -229,14 +259,12 @@ const char *            phase2-client-cert"       GArray_guchar_*       : Read / Write
   "phase2-private-key"       GArray_guchar_*       : Read / Write
   "phase2-private-key-password" gchar*                : Read / Write
-  "phase2-private-key-password-flags" guint                 : Read / Write
   "private-key"              GArray_guchar_*       : Read / Write
   "private-key-password"     gchar*                : Read / Write
-  "private-key-password-flags" guint                 : Read / Write
   "system-ca-certs"          gboolean              : Read / Write / Construct

Description

The NMSetting8021x object is a NMSetting subclass that describes @@ -267,9 +295,9 @@ following books. ISBN: 978-1587051548

Details

enum NMSetting8021xCKFormat

typedef enum {
 	NM_SETTING_802_1X_CK_FORMAT_UNKNOWN = 0,
@@ -279,39 +307,10 @@ following books.
 } NMSetting8021xCKFormat;

-NMSetting8021xCKFormat values indicate the general type of a certificate -or private key

-- - - - - - - - - - - - - - - - - - -

`NM_SETTING_802_1X_CK_FORMAT_UNKNOWN`	unknown file format -
`NM_SETTING_802_1X_CK_FORMAT_X509`	file contains an X.509 format certificate -
`NM_SETTING_802_1X_CK_FORMAT_RAW_KEY`	file contains an old-style OpenSSL PEM -or DER private key -
`NM_SETTING_802_1X_CK_FORMAT_PKCS12`	file contains a PKCS12 certificate -and private key -

enum NMSetting8021xCKScheme

typedef enum {
 	NM_SETTING_802_1X_CK_SCHEME_UNKNOWN = 0,
@@ -320,36 +319,10 @@ and private key
 } NMSetting8021xCKScheme;

-NMSetting8021xCKScheme values indicate how a certificate or private key is -stored in the setting properties, either as a blob of the item's data, or as -a path to a certificate or private key file on the filesystem

-- - - - - - - - - - - - - - -

`NM_SETTING_802_1X_CK_SCHEME_UNKNOWN`	unknown certificate or private key -scheme -
`NM_SETTING_802_1X_CK_SCHEME_BLOB`	certificate or key is stored as the raw -item data -
`NM_SETTING_802_1X_CK_SCHEME_PATH`	certificate or key is stored as a path -to a file containing the certificate or key data -

NM_SETTING_802_1X_SETTING_NAME

#define NM_SETTING_802_1X_SETTING_NAME "802-1x"

@@ -357,7 +330,7 @@ to a file containing the certificate or key data

enum NMSetting8021xError

typedef enum
 {
@@ -370,7 +343,7 @@ to a file containing the certificate or key data

NM_TYPE_SETTING_802_1X_ERROR

#define NM_TYPE_SETTING_802_1X_ERROR (nm_setting_802_1x_error_get_type ())

@@ -378,7 +351,7 @@ to a file containing the certificate or key data

NM_SETTING_802_1X_ERROR

#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()

@@ -386,7 +359,7 @@ to a file containing the certificate or key data

nm_setting_802_1x_error_quark ()

GQuark              nm_setting_802_1x_error_quark       (void);

@@ -396,12 +369,13 @@ Registers an error quark for

Returns :

-the error quark used for NMSetting8021x errors. + the error quark used for NMSetting8021x errors. +

NM_SETTING_802_1X_EAP

#define NM_SETTING_802_1X_EAP "eap"

@@ -409,7 +383,7 @@ Registers an error quark for +

NM_SETTING_802_1X_IDENTITY

#define NM_SETTING_802_1X_IDENTITY "identity"

@@ -417,7 +391,7 @@ Registers an error quark for +

NM_SETTING_802_1X_ANONYMOUS_IDENTITY

#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"

@@ -425,7 +399,7 @@ Registers an error quark for +

NM_SETTING_802_1X_CA_CERT

#define NM_SETTING_802_1X_CA_CERT "ca-cert"

@@ -433,7 +407,7 @@ Registers an error quark for +

NM_SETTING_802_1X_CA_PATH

#define NM_SETTING_802_1X_CA_PATH "ca-path"

@@ -441,7 +415,7 @@ Registers an error quark for +

NM_SETTING_802_1X_CLIENT_CERT

#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"

@@ -449,7 +423,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE1_PEAPVER

#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"

@@ -457,7 +431,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE1_PEAPLABEL

#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"

@@ -465,7 +439,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING

#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"

@@ -473,7 +447,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE2_AUTH

#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"

@@ -481,7 +455,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE2_AUTHEAP

#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"

@@ -489,7 +463,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE2_CA_CERT

#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"

@@ -497,7 +471,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE2_CA_PATH

#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"

@@ -505,7 +479,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE2_CLIENT_CERT

#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"

@@ -513,7 +487,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PASSWORD

#define NM_SETTING_802_1X_PASSWORD "password"

@@ -521,15 +495,7 @@ Registers an error quark for -

NM_SETTING_802_1X_PASSWORD_FLAGS

#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
-

NM_SETTING_802_1X_PRIVATE_KEY

#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"

@@ -537,7 +503,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"

@@ -545,15 +511,7 @@ Registers an error quark for -

NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS

#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
-

NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"

@@ -561,7 +519,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"

@@ -569,15 +527,7 @@ Registers an error quark for -

NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS

#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
-

NM_SETTING_802_1X_PIN

#define NM_SETTING_802_1X_PIN "pin"

@@ -585,15 +535,15 @@ Registers an error quark for -

NM_SETTING_802_1X_PIN_FLAGS

#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
+
+NM_SETTING_802_1X_PSK
+#define NM_SETTING_802_1X_PSK "psk"
 
 
 
 
 
-
+
 NM_SETTING_802_1X_SYSTEM_CA_CERTS
 #define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
 
@@ -601,14 +551,14 @@ Registers an error quark for 
+
 NMSetting8021x
 typedef struct _NMSetting8021x NMSetting8021x;
 
 
 
 
-
+
 NMSetting8021xClass
 typedef struct {
 	NMSettingClass parent;
@@ -624,14 +574,22 @@ Registers an error quark for 
+
 nm_setting_802_1x_get_type ()
 GType               nm_setting_802_1x_get_type          (void);
 
 
+
++
+
+
+
+
Returns : 
+
 
 
-
+
 nm_setting_802_1x_new ()
 NMSetting *         nm_setting_802_1x_new               (void);
 
@@ -641,12 +599,13 @@ Creates a new 
 
 
 
Returns :

-the new empty NMSetting8021x object
+ the new empty NMSetting8021x object
+
 
 
 
 
-
+
 nm_setting_802_1x_get_num_eap_methods ()
 guint32             nm_setting_802_1x_get_num_eap_methods
                                                         (NMSetting8021x *setting);
@@ -667,13 +626,14 @@ allowed EAP methods.
 
 
 Returns :
-the number of allowed EAP methods
+ the number of allowed EAP methods
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_eap_method ()
 const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
                                                          guint32 i);
@@ -690,18 +650,19 @@ Returns the name of the allowed EAP method at index 
 
 
 i :
-the index of the EAP method name to return
+the index of the EAP method name to return
+
 
 
 Returns :
-the name of the allowed EAP method at index i
+ the name of the allowed EAP method at index i
 
 
 
 

 

 
-
+
 nm_setting_802_1x_add_eap_method ()
 gboolean            nm_setting_802_1x_add_eap_method    (NMSetting8021x *setting,
                                                          const char *eap);
@@ -720,18 +681,20 @@ allowed EAP methods.
 
 
 eap :
-the name of the EAP method to allow for this connection
+the name of the EAP method to allow for this connection
+
 
 
 Returns :
-TRUE if the EAP method was successfully added, FALSE if it was
-not a valid method or if it was already allowed.
+ TRUE if the EAP method was successfully added, FALSE if it was
+ not a valid method or if it was already allowed.
+
 
 
 
 
 
-
+
 nm_setting_802_1x_remove_eap_method ()
 void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
                                                          guint32 i);
@@ -748,13 +711,14 @@ Removes the allowed EAP method at the specified index.
 
 
 i :
-the index of the EAP method to remove
+the index of the EAP method to remove
+
 
 
 
 
 
-
+
 nm_setting_802_1x_clear_eap_methods ()
 void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);
 
@@ -770,7 +734,7 @@ Clears all allowed EAP methods.
 
 
 
-
+
 nm_setting_802_1x_get_identity ()
 const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);
 
@@ -787,13 +751,14 @@ authenticate the user.  Often this is a username or login name.
 
 
 
Returns :
-the user identifier
+ the user identifier
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_anonymous_identity ()
 const char *        nm_setting_802_1x_get_anonymous_identity
                                                         (NMSetting8021x *setting);
@@ -813,13 +778,14 @@ a secure form, if applicable for that EAP method.
 
 
 Returns :
-the anonymous identifier
+ the anonymous identifier
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_system_ca_certs ()
 gboolean            nm_setting_802_1x_get_system_ca_certs
                                                         (NMSetting8021x *setting);
@@ -841,13 +807,14 @@ of these properties.
 
 
 Returns :
-TRUE if a system CA certificate path should be used, FALSE if not
+ TRUE if a system CA certificate path should be used, FALSE if not
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_ca_path ()
 const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);
 
@@ -867,13 +834,14 @@ certificates for verifying the network to client.
 
 
 
Returns :
-the CA certificate directory path
+ the CA certificate directory path
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_phase2_ca_path ()
 const char *        nm_setting_802_1x_get_phase2_ca_path
                                                         (NMSetting8021x *setting);
@@ -894,20 +862,21 @@ to add more CA certificates for verifying the network to client.
 
 
 Returns :
-the "phase 2" CA certificate directory path
+ the "phase 2" CA certificate directory path
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_ca_cert_scheme ()
 NMSetting8021xCKScheme  nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);
 
 Returns the scheme used to store the CA certificate.  If the returned scheme
-is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
-if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().
+is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
+if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().
 
 @@ -919,19 +888,19 @@ if Returns :
-
+
 
scheme used to store the CA certificate (blob or path)  scheme used to store the CA certificate (blob or path)
+
 
 
 

 

 
-
+
 nm_setting_802_1x_get_ca_cert_blob ()
-const GByteArray *      nm_setting_802_1x_get_ca_cert_blob
-                                                        (NMSetting8021x *setting);
+const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);
 
 Returns the CA certificate blob if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
 CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -947,19 +916,19 @@ of the network cannot be confirmed by the client.
 
 
 
Returns :
-the CA certificate data
+ the CA certificate data
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_ca_cert_path ()
-const char *            nm_setting_802_1x_get_ca_cert_path
-                                                        (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);
 
 Returns the CA certificate path if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use a
+NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use a
 CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -975,13 +944,14 @@ of the network cannot be confirmed by the client.
 
 
 
Returns :
-path to the CA certificate file
+ path to the CA certificate file
+
 
 
 
 
 
-
+
 nm_setting_802_1x_set_ca_cert ()
 gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
                                                          const char *value,
@@ -990,9 +960,9 @@ of the network cannot be confirmed by the client.
                                                          GError **error);
 
 Reads a certificate from disk and sets the "ca-cert" property
-with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
+with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
 scheme, or with the path to the certificate file if using the
-NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 
 @@ -1004,40 +974,45 @@ scheme, or with the path to the certificate file if using the
 
-
+
-
+
-
+
-
+
-
+
 

 
 value : when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate file
-(PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the CA certificate. when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate file
+  (PEM or DER format).  The path must be UTF-8 encoded; use
+  g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+  clears the CA certificate.
+
 
 
 scheme : desired storage scheme for the certificate desired storage scheme for the certificate
+
 
 
 out_format : on successful return, the type of the certificate added on successful return, the type of the certificate added
+
 
 
 error : on unsuccessful return, an error on unsuccessful return, an error
+
 
 
 Returns : TRUE if the operation succeeded, FALSE if it was unsuccessful  TRUE if the operation succeeded, FALSE if it was unsuccessful
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_client_cert_scheme ()
 NMSetting8021xCKScheme  nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);
 
 Returns the scheme used to store the client certificate.  If the returned scheme
-is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
-if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().
+is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
+if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().
 
 @@ -1049,15 +1024,16 @@ if Returns :
-
+
 
scheme used to store the client certificate (blob or path)  scheme used to store the client certificate (blob or path)
+
 
 
 

 

 
-
+
 nm_setting_802_1x_get_client_cert_blob ()
-const GByteArray *      nm_setting_802_1x_get_client_cert_blob
+const GByteArray *  nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);
 
 Client certificates are used to identify the connecting client to the network
@@ -1074,15 +1050,16 @@ authentication method.
 
 
 
Returns :
-the client certificate data
+ the client certificate data
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_client_cert_path ()
-const char *            nm_setting_802_1x_get_client_cert_path
+const char *        nm_setting_802_1x_get_client_cert_path
                                                         (NMSetting8021x *setting);
 
 Client certificates are used to identify the connecting client to the network
@@ -1099,13 +1076,14 @@ authentication method.
 
 
 
Returns :
-path to the client certificate file
+ path to the client certificate file
+
 
 
 
 
 
-
+
 nm_setting_802_1x_set_client_cert ()
 gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
                                                          const char *value,
@@ -1115,8 +1093,8 @@ authentication method.
 
 Reads a certificate from disk and sets the "client-cert"
 property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 
 
 Client certificates are used to identify the connecting client to the network
@@ -1133,33 +1111,38 @@ authentication method.
 
 
 
value :
-when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client certificate
-file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the client certificate.
+when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client certificate
+  file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
+  g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+  clears the client certificate.
+
 
 
 scheme :
-desired storage scheme for the certificate
+desired storage scheme for the certificate
+
 
 
 out_format :
-on successful return, the type of the certificate added
+on successful return, the type of the certificate added
+
 
 
 error :
-on unsuccessful return, an error
+on unsuccessful return, an error
+
 
 
 Returns :
-TRUE if the operation succeeded, FALSE if it was unsuccessful
+ TRUE if the operation succeeded, FALSE if it was unsuccessful
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_phase1_peapver ()
 const char *        nm_setting_802_1x_get_phase1_peapver
                                                         (NMSetting8021x *setting);
@@ -1173,15 +1156,16 @@ clears the client certificate.
 
 
 Returns :
-the "phase 1" PEAP version to be used when authenticating with
-EAP-PEAP as contained in the "phase1-peapver" property.  Valid
-values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
+ the "phase 1" PEAP version to be used when authenticating with
+ EAP-PEAP as contained in the "phase1-peapver" property.  Valid
+ values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_phase1_peaplabel ()
 const char *        nm_setting_802_1x_get_phase1_peaplabel
                                                         (NMSetting8021x *setting);
@@ -1195,17 +1179,18 @@ values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
 
 
 Returns :
-whether the "phase 1" PEAP label is new-style or old-style, to be
-used when authenticating with EAP-PEAP, as contained in the
-"phase1-peaplabel" property.  Valid values are NULL (unset),
-"0" (use old-style label), and "1" (use new-style label).  See the
-wpa_supplicant documentation for more details.
+ whether the "phase 1" PEAP label is new-style or old-style, to be
+ used when authenticating with EAP-PEAP, as contained in the
+ "phase1-peaplabel" property.  Valid values are NULL (unset),
+ "0" (use old-style label), and "1" (use new-style label).  See the
+ wpa_supplicant documentation for more details.
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_phase1_fast_provisioning ()
 const char *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (NMSetting8021x *setting);
@@ -1219,15 +1204,16 @@ wpa_supplicant documentation for more details.
 
 
 Returns :
-whether "phase 1" PEAP fast provisioning should be used, as specified
-by the "phase1-fast-provisioning" property.  See the
-wpa_supplicant documentation for more details.
+ whether "phase 1" PEAP fast provisioning should be used, as specified
+ by the "phase1-fast-provisioning" property.  See the
+ wpa_supplicant documentation for more details.
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_phase2_auth ()
 const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);
 
@@ -1240,14 +1226,15 @@ wpa_supplicant documentation for more details.
-
+
 
 
 Returns : the "phase 2" non-EAP (ex MD5) allowed authentication method as
-specified by the "phase2-auth" property.  the "phase 2" non-EAP (ex MD5) allowed authentication method as
+  specified by the "phase2-auth" property.
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_phase2_autheap ()
 const char *        nm_setting_802_1x_get_phase2_autheap
                                                         (NMSetting8021x *setting);
@@ -1261,21 +1248,22 @@ specified by the Returns :
-the "phase 2" EAP-based (ex TLS) allowed authentication method as
-specified by the "phase2-autheap" property.
+ the "phase 2" EAP-based (ex TLS) allowed authentication method as
+  specified by the "phase2-autheap" property.
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_phase2_ca_cert_scheme ()
 NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (NMSetting8021x *setting);
 
 Returns the scheme used to store the "phase 2" CA certificate.  If the
-returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
-nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
+returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
 use nm_setting_802_1x_get_ca_cert_path().
 
 
@@ -1288,19 +1276,20 @@ use Returns :
-
+scheme used to store the "phase 2" CA certificate (blob or path)  scheme used to store the "phase 2" CA certificate (blob or path)
+
 
 
 

 

 
-
+
 nm_setting_802_1x_get_phase2_ca_cert_blob ()
-const GByteArray *      nm_setting_802_1x_get_phase2_ca_cert_blob
+const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert_blob
                                                         (NMSetting8021x *setting);
 
 Returns the "phase 2" CA certificate blob if the CA certificate is stored
-using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use
+using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use
 a CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -1316,19 +1305,20 @@ of the network cannot be confirmed by the client.
 
 
 
Returns :
-the "phase 2" CA certificate data
+ the "phase 2" CA certificate data
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_phase2_ca_cert_path ()
-const char *            nm_setting_802_1x_get_phase2_ca_cert_path
+const char *        nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (NMSetting8021x *setting);
 
 Returns the "phase 2" CA certificate path if the CA certificate is stored
-using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use
+using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use
 a CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -1344,13 +1334,14 @@ of the network cannot be confirmed by the client.
 
 
 
Returns :
-path to the "phase 2" CA certificate file
+ path to the "phase 2" CA certificate file
+
 
 
 
 
 
-
+
 nm_setting_802_1x_set_phase2_ca_cert ()
 gboolean            nm_setting_802_1x_set_phase2_ca_cert
                                                         (NMSetting8021x *setting,
@@ -1361,8 +1352,8 @@ of the network cannot be confirmed by the client.
 
 Reads a certificate from disk and sets the "phase2-ca-cert"
 property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 
 @@ -1374,41 +1365,46 @@ file if using the value :
-
+
-
+
-
+
-
+
-
+
 
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
-certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the "phase2" CA certificate. when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
+  certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
+  g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+  clears the "phase2" CA certificate.
+
 
 
 scheme : desired storage scheme for the certificate desired storage scheme for the certificate
+
 
 
 out_format : on successful return, the type of the certificate added on successful return, the type of the certificate added
+
 
 
 error : on unsuccessful return, an error on unsuccessful return, an error
+
 
 
 Returns : TRUE if the operation succeeded, FALSE if it was unsuccessful  TRUE if the operation succeeded, FALSE if it was unsuccessful
+
 
 
 

 

 
-
+
 nm_setting_802_1x_get_phase2_client_cert_scheme ()
 NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);
 
 Returns the scheme used to store the "phase 2" client certificate.  If the
-returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
 nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
 
 
@@ -1421,15 +1417,16 @@ returned scheme is Returns :
-
+scheme used to store the "phase 2" client certificate (blob or path)  scheme used to store the "phase 2" client certificate (blob or path)
+
 
 
 

 

 
-
+
 nm_setting_802_1x_get_phase2_client_cert_blob ()
-const GByteArray *      nm_setting_802_1x_get_phase2_client_cert_blob
+const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
                                                         (NMSetting8021x *setting);
 
 Client certificates are used to identify the connecting client to the network
@@ -1446,15 +1443,16 @@ authentication method.
 
 
 
Returns :
-the "phase 2" client certificate data
+ the "phase 2" client certificate data
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_phase2_client_cert_path ()
-const char *            nm_setting_802_1x_get_phase2_client_cert_path
+const char *        nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);
 
 Client certificates are used to identify the connecting client to the network
@@ -1471,13 +1469,14 @@ authentication method.
 
 
 
Returns :
-path to the "phase 2" client certificate file
+ path to the "phase 2" client certificate file
+
 
 
 
 
 
-
+
 nm_setting_802_1x_set_phase2_client_cert ()
 gboolean            nm_setting_802_1x_set_phase2_client_cert
                                                         (NMSetting8021x *setting,
@@ -1488,8 +1487,8 @@ authentication method.
 
 Reads a certificate from disk and sets the "phase2-client-cert"
 property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 
 
 Client certificates are used to identify the connecting client to the network
@@ -1506,33 +1505,38 @@ authentication method.
 
 
 
value :
-when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
-certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
-any scheme clears the "phase2" client certificate.
+when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
+  certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
+  encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+  any scheme clears the "phase2" client certificate.
+
 
 
 scheme :
-desired storage scheme for the certificate
+desired storage scheme for the certificate
+
 
 
 out_format :
-on successful return, the type of the certificate added
+on successful return, the type of the certificate added
+
 
 
 error :
-on unsuccessful return, an error
+on unsuccessful return, an error
+
 
 
 Returns :
-TRUE if the operation succeeded, FALSE if it was unsuccessful
+ TRUE if the operation succeeded, FALSE if it was unsuccessful
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_password ()
 const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
 
@@ -1545,35 +1549,15 @@ any scheme clears the "phase2" client ce
 
-
-
-
-
 
 Returns : the password used by the authentication method, if any, as specified
-by the "password" property
-
-
-
-nm_setting_802_1x_get_password_flags ()
-NMSettingSecretFlags  nm_setting_802_1x_get_password_flags
-                                                        (NMSetting8021x *setting);
-
--
-
-
-
-
-
-
-
setting : the NMSetting8021x
-
Returns : the NMSettingSecretFlags pertaining to the "password"
+  the password used by the authentication method, if any, as specified
+  by the "password" property
 
 
 
 
 
 
-
+
 nm_setting_802_1x_get_pin ()
 const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);
 
@@ -1586,16 +1570,17 @@ by the 
 
-
+
 Returns : the PIN used by the authentication method, if any, as specified
-by the "pin" property  the PIN used by the authentication method, if any, as specified
+  by the "pin" property
+
 
 
 

 

 
-
-nm_setting_802_1x_get_pin_flags ()
-NMSettingSecretFlags  nm_setting_802_1x_get_pin_flags   (NMSetting8021x *setting);
+
+nm_setting_802_1x_get_psk ()
+const char *        nm_setting_802_1x_get_psk           (NMSetting8021x *setting);
 
@@ -1606,23 +1591,23 @@ by the "pin" property
-
 
 
 
 
 Returns : the NMSettingSecretFlags pertaining to the
-"pin"
+  the Pre-Shared-Key used by the authentication method, if any, as
+  specified by the "psk" property
 
 
 
 
 
 
-
+
 nm_setting_802_1x_get_private_key_scheme ()
 NMSetting8021xCKScheme  nm_setting_802_1x_get_private_key_scheme
                                                         (NMSetting8021x *setting);
 
 Returns the scheme used to store the private key.  If the returned scheme is
-NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+NM_SETTING_802_1X_CK_SCHEME_BLOB, use
 nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
 
 
@@ -1635,26 +1620,22 @@ Returns the scheme used to store the private key.  If the returned scheme is
 
-
+
 
 Returns : scheme used to store the private key (blob or path)  scheme used to store the private key (blob or path)
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_private_key_blob ()
-const GByteArray *      nm_setting_802_1x_get_private_key_blob
+const GByteArray *  nm_setting_802_1x_get_private_key_blob
                                                         (NMSetting8021x *setting);
 
 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 
-
-WARNING: the private key property is not a "secret" property, and thus
-unencrypted private key data may be readable by unprivileged users.  Private
-keys should always be encrypted with a private key password.
-
 
@@ -1665,15 +1646,16 @@ keys should always be encrypted with a private key password.
 
-
+
 
 
 
 Returns : the private key data  the private key data
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_private_key_path ()
-const char *            nm_setting_802_1x_get_private_key_path
+const char *        nm_setting_802_1x_get_private_key_path
                                                         (NMSetting8021x *setting);
 
 Private keys are used to authenticate the connecting client to the network
@@ -1690,13 +1672,14 @@ authentication method.
 
 
 
Returns :
-path to the private key file
+ path to the private key file
+
 
 
 
 
 
-
+
 nm_setting_802_1x_set_private_key ()
 gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
                                                          const char *value,
@@ -1705,31 +1688,16 @@ authentication method.
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 
+Reads a private key from disk and sets the "private-key"
+property with the raw private key data if using the
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private key
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+
+
 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 
-
-This function reads a private key from disk and sets the
-"private-key" property with the private key file data if using
-the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private
-key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-
-
-If password is given, this function attempts to decrypt the private key to
-verify that password is correct, and if it is, updates the
-"private-key-password" property with the given password.  If
-the decryption is unsuccessful, FALSE is returned, error is set, and no
-internal data is changed.  If no password is given, the private key is
-assumed to be valid, no decryption is performed, and the password may be set
-at a later time.
-
-
-WARNING: the private key property is not a "secret" property, and thus
-unencrypted private key data using the BLOB scheme may be readable by
-unprivileged users.  Private keys should always be encrypted with a private
-key password to prevent unauthorized access to unencrypted private key data.
-
 
@@ -1740,64 +1708,45 @@ key password to prevent unauthorized access to unencrypted private key data.
 
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
 
 
 
 value : when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
-(PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the private key. when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
+  (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
+  g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+  clears the private key.
+
 
 
 password : password used to decrypt the private key, or NULL if the password
-is unknown.  If the password is given but fails to decrypt the private key,
-an error is returned. password used to decrypt the private key
+
 
 
 scheme : desired storage scheme for the private key desired storage scheme for the private key
+
 
 
 out_format : on successful return, the type of the private key added on successful return, the type of the private key added
+
 
 
 error : on unsuccessful return, an error
Returns : TRUE if the operation succeeded, FALSE if it was unsuccessful
-
-
-
-nm_setting_802_1x_get_private_key_password ()
-const char *            nm_setting_802_1x_get_private_key_password
-                                                        (NMSetting8021x *setting);
-
--
-
-
-
-
+
setting : the NMSetting8021x
+ on unsuccessful return, an error
 
 
 
 Returns : the private key password used to decrypt the private key if
-previously set with nm_setting_802_1x_set_private_key_from_file(),
-nm_setting_802_1x_set_private_key_path(), or the
-"private-key-password" property.  TRUE if the operation succeeded, FALSE if it was unsuccessful
+
 
 
 
 
 
-
-nm_setting_802_1x_get_private_key_password_flags ()
-NMSettingSecretFlags  nm_setting_802_1x_get_private_key_password_flags
+
+nm_setting_802_1x_get_private_key_password ()
+const char *        nm_setting_802_1x_get_private_key_password
                                                         (NMSetting8021x *setting);
 @@ -1809,15 +1758,17 @@ previously set with nm_setting_802_1x_set_private_key_fro
 
 
-
 

 Returns : the NMSettingSecretFlags pertaining to the
-"private-key-password"
+  the private key password used to decrypt the private key if
+ previously set with nm_setting_802_1x_set_private_key_from_file(),
+ nm_setting_802_1x_set_private_key_path(), or the
+ "private-key-password" property.
 
 
 
 

 

 
-
+
 nm_setting_802_1x_get_private_key_format ()
 NMSetting8021xCKFormat  nm_setting_802_1x_get_private_key_format
                                                         (NMSetting8021x *setting);
@@ -1831,22 +1782,23 @@ previously set with nm_setting_802_1x_set_private_key_fro
 
 
 Returns :
-the data format of the private key data stored in the
-"private-key" property
+ the data format of the private key data stored in the
+  "private-key" property
+
 
 
 

 

 
-
+
 nm_setting_802_1x_get_phase2_private_key_scheme ()
 NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);
 
 Returns the scheme used to store the "phase 2" private key.  If the returned
-scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
 nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
 
 
@@ -1859,26 +1811,22 @@ scheme is Returns :
-
+scheme used to store the "phase 2" private key (blob or path)  scheme used to store the "phase 2" private key (blob or path)
+
 
 
 

 

 
-
+
 nm_setting_802_1x_get_phase2_private_key_blob ()
-const GByteArray *      nm_setting_802_1x_get_phase2_private_key_blob
+const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
                                                         (NMSetting8021x *setting);
 
 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 
-
-WARNING: the phase2 private key property is not a "secret" property, and thus
-unencrypted private key data may be readable by unprivileged users.  Private
-keys should always be encrypted with a private key password.
-
 
@@ -1889,15 +1837,16 @@ keys should always be encrypted with a private key password.
 
-
+
 
 
 
 Returns : the "phase 2" private key data  the "phase 2" private key data
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_phase2_private_key_path ()
-const char *            nm_setting_802_1x_get_phase2_private_key_path
+const char *        nm_setting_802_1x_get_phase2_private_key_path
                                                         (NMSetting8021x *setting);
 
 Private keys are used to authenticate the connecting client to the network
@@ -1914,13 +1863,14 @@ authentication method.
 
 
 
Returns :
-path to the "phase 2" private key file
+ path to the "phase 2" private key file
+
 
 
 
 
 
-
+
 nm_setting_802_1x_set_phase2_private_key ()
 gboolean            nm_setting_802_1x_set_phase2_private_key
                                                         (NMSetting8021x *setting,
@@ -1930,31 +1880,16 @@ authentication method.
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 
+Reads a "phase 2" private key from disk and sets the
+"phase2-private-key" property with the raw private key data if
+using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the
+private key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+
+
 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 
-
-This function reads a private key from disk and sets the
-"phase2-private-key" property with the private key file data if
-using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the
-private key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-
-
-If password is given, this function attempts to decrypt the private key to
-verify that password is correct, and if it is, updates the
-"phase2-private-key-password" property with the given
-password.  If the decryption is unsuccessful, FALSE is returned, error is
-set, and no internal data is changed.  If no password is given, the private
-key is assumed to be valid, no decryption is performed, and the password may
-be set at a later time.
-
-
-WARNING: the "phase2" private key property is not a "secret" property, and
-thus unencrypted private key data using the BLOB scheme may be readable by
-unprivileged users.  Private keys should always be encrypted with a private
-key password to prevent unauthorized access to unencrypted private key data.
-
 
@@ -1965,41 +1900,45 @@ key password to prevent unauthorized access to unencrypted private key data.
 
-
+
-
+
-
+
-
+
-
+
-
+
 
 
 
 value : when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private
-key file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded;
-use g_filename_to_utf8() to convert if needed.  Passing NULL with any
-scheme clears the private key. when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private 
+  key file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded;
+  use g_filename_to_utf8() to convert if needed.  Passing NULL with any
+  scheme clears the "phase2" private key.
+
 
 
 password : password used to decrypt the private key, or NULL if the password
-is unknown.  If the password is given but fails to decrypt the private key,
-an error is returned. password used to decrypt the private key
+
 
 
 scheme : desired storage scheme for the private key desired storage scheme for the private key
+
 
 
 out_format : on successful return, the type of the private key added on successful return, the type of the private key added
+
 
 
 error : on unsuccessful return, an error on unsuccessful return, an error
+
 
 
 Returns : TRUE if the operation succeeded, FALSE if it was unsuccessful  TRUE if the operation succeeded, FALSE if it was unsuccessful
+
 
 
 
 
 
-
+
 nm_setting_802_1x_get_phase2_private_key_password ()
-const char *            nm_setting_802_1x_get_phase2_private_key_password
+const char *        nm_setting_802_1x_get_phase2_private_key_password
                                                         (NMSetting8021x *setting);
 @@ -2011,18 +1950,19 @@ an error is returned.
-
+
 

 
 
 Returns : the private key password used to decrypt the private key if
-previously set with nm_setting_802_1x_set_phase2_private_key_from_file(),
-nm_setting_802_1x_set_phase2_private_key_path(), or the
-"phase2-private-key-password" property.  the private key password used to decrypt the private key if
+ previously set with nm_setting_802_1x_set_phase2_private_key_from_file(),
+ nm_setting_802_1x_set_phase2_private_key_path(), or the
+ "phase2-private-key-password" property.
+
 
 
 
 
 
-
-nm_setting_802_1x_get_phase2_private_key_password_flags ()
-NMSettingSecretFlags  nm_setting_802_1x_get_phase2_private_key_password_flags
+
+nm_setting_802_1x_get_phase2_private_key_format ()
+NMSetting8021xCKFormat  nm_setting_802_1x_get_phase2_private_key_format
                                                         (NMSetting8021x *setting);
 @@ -2034,18 +1974,44 @@ previously set with nm_setting_802_1x_set_phase2_private_
 
 
-
 

 Returns : the NMSettingSecretFlags pertaining to the
-"phase2-private-key-password"
+  the data format of the "phase 2" private key data stored in the
+  "phase2-private-key" property
 
 
 
 

 

 
-
-nm_setting_802_1x_get_phase2_private_key_format ()
-NMSetting8021xCKFormat  nm_setting_802_1x_get_phase2_private_key_format
-                                                        (NMSetting8021x *setting);
+
+enum NMSetting8021xCKType
+typedef enum {
+	NM_SETTING_802_1X_CK_TYPE_UNKNOWN = 0,
+	NM_SETTING_802_1X_CK_TYPE_X509,
+	NM_SETTING_802_1X_CK_TYPE_RAW_KEY,
+	NM_SETTING_802_1X_CK_TYPE_PKCS12
+} NMSetting8021xCKType;
+
+
+
+
+
+
+nm_setting_802_1x_get_ca_cert ()
+const GByteArray *  nm_setting_802_1x_get_ca_cert       (NMSetting8021x *setting);
+
+Warning
+nm_setting_802_1x_get_ca_cert has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_ca_cert_blob().
+
+
+Returns the CA certificate blob if the CA certificate is stored using the
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
+CA certificate (LEAP for example), and those that can take advantage of the
+CA certificate allow it to be unset.  Note that lack of a CA certificate
+reduces security by allowing man-in-the-middle attacks, because the identity
+of the network cannot be confirmed by the client.
+
 
@@ -2056,50 +2022,605 @@ previously set with nm_setting_802_1x_set_phase2_private_
 
 
-
+
 
 
 Returns : the data format of the "phase 2" private key data stored in the
-"phase2-private-key" property  the CA certificate data
+
 
 
 

 

-

-
-Property Details
-
-The "anonymous-identity" property
-  "anonymous-identity"       gchar*                : Read / Write
-
-Anonymous identity string for EAP authentication methods.  Used as the
-unencrypted identity with EAP types that support different tunneled
-identity like EAP-TTLS.
-
-Default value: NULL
-
 
-
-The "ca-cert" property
-  "ca-cert"                  GArray_guchar_*       : Read / Write
-
-Contains the CA certificate if used by the EAP method specified in the
-"eap" property.  Setting this property directly is
-discouraged; use the nm_setting_802_1x_set_ca_cert() function instead.
-
+
+nm_setting_802_1x_set_ca_cert_from_file ()
+gboolean            nm_setting_802_1x_set_ca_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+
+Warning
+nm_setting_802_1x_set_ca_cert_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_set_ca_cert() with the
+  NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.
 
-
-
-The "ca-path" property
-  "ca-path"                  gchar*                : Read / Write
 
-UTF-8 encoded path to a directory containing PEM or DER formatted
-certificates to be added to the verification chain in addition to the
-certificate specified in the "ca-cert" property.
+Reads a certificate from disk and sets the "ca-cert" property
+with the raw certificate data using the NM_SETTING_802_1X_CK_SCHEME_BLOB
+scheme.
+
+
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
filename : the path of the CA certificate file (PEM or DER format). Passing
+  NULL clears the CA certificate.
+
out_ck_type : on successful return, the type of the certificate added
+
error : on unsuccessful return, an error
+
Returns :  TRUE if the operation succeeded, FALSE if it was unsuccessful
+
+
+
+
+nm_setting_802_1x_get_client_cert ()
+const GByteArray *  nm_setting_802_1x_get_client_cert   (NMSetting8021x *setting);
+
+Warning
+nm_setting_802_1x_get_client_cert has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_client_cert_blob().
+
+
+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+
+
++
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
Returns :  the client certificate data
+
+
+
+
+nm_setting_802_1x_set_client_cert_from_file ()
+gboolean            nm_setting_802_1x_set_client_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+
+Warning
+nm_setting_802_1x_set_client_cert_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_set_client_cert() with the
+  NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.
+
+
+Reads a certificate from disk and sets the "client-cert"
+property with the raw certificate data.
+
+
+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+
+
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
filename : the path of the client certificate file (PEM, DER, or
+  PKCS12 format).  Passing NULL clears the client certificate.
+
out_ck_type : on successful return, the type of the certificate added
+
error : on unsuccessful return, an error
+
Returns :  TRUE if the operation succeeded, FALSE if it was unsuccessful
+
+
+
+
+nm_setting_802_1x_get_phase2_ca_cert ()
+const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert
+                                                        (NMSetting8021x *setting);
+
+Warning
+nm_setting_802_1x_get_phase2_ca_cert has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_phase2_ca_cert_blob().
+
+
+Returns the "phase 2" CA certificate blob.  Not all EAP methods use
+a CA certificate (LEAP for example), and those that can take advantage of the
+CA certificate allow it to be unset.  Note that lack of a CA certificate
+reduces security by allowing man-in-the-middle attacks, because the identity
+of the network cannot be confirmed by the client.
+
+
++
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
Returns :  the "phase 2" CA certificate data
+
+
+
+
+nm_setting_802_1x_set_phase2_ca_cert_from_file ()
+gboolean            nm_setting_802_1x_set_phase2_ca_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+
+Warning
+nm_setting_802_1x_set_phase2_ca_cert_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_set_phase2_ca_cert().
+  with the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.
+
+
+Reads a certificate from disk and sets the "phase2-ca-cert"
+property with the raw certificate data.
+
+
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
filename : the path of the "phase2" CA certificate file (PEM or DER format).
+  Passing NULL with any scheme clears the "phase2" CA certificate.
+
out_ck_type : on successful return, the type of the certificate added
+
error : on unsuccessful return, an error
+
Returns :  TRUE if the operation succeeded, FALSE if it was unsuccessful
+
+
+
+
+nm_setting_802_1x_get_phase2_client_cert ()
+const GByteArray *  nm_setting_802_1x_get_phase2_client_cert
+                                                        (NMSetting8021x *setting);
+
+Warning
+nm_setting_802_1x_get_phase2_client_cert has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_phase2_client_cert_blob().
+
+
+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+
+
++
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
Returns :  the "phase 2" client certificate data
+
+
+
+
+nm_setting_802_1x_set_phase2_client_cert_from_file ()
+gboolean            nm_setting_802_1x_set_phase2_client_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+
+Warning
+nm_setting_802_1x_set_phase2_client_cert_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_set_phase2_client_cert() with the.
+  NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.
+
+
+Reads a certificate from disk and sets the "phase2-client-cert"
+property with the raw certificate data.
+
+
+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+
+
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
filename : pass the path of the "phase2" client certificate file (PEM, DER,
+  or PKCS12 format).  Passing NULL clears the "phase2" client certificate.
+
out_ck_type : on successful return, the type of the certificate added
+
error : on unsuccessful return, an error
+
Returns :  TRUE if the operation succeeded, FALSE if it was unsuccessful
+
+
+
+
+nm_setting_802_1x_get_private_key ()
+const GByteArray *  nm_setting_802_1x_get_private_key   (NMSetting8021x *setting);
+
+Warning
+nm_setting_802_1x_get_private_key has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_private_key_blob().
+
+
+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+
+
++
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
Returns :  the private key data
+
+
+
+
+nm_setting_802_1x_set_private_key_from_file ()
+gboolean            nm_setting_802_1x_set_private_key_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         const char *password,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+
+Warning
+nm_setting_802_1x_set_private_key_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_set_private_key() with.
+  the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.
+
+
+Reads a private key from disk and sets the "private-key"
+property with the raw private key data.
 
-Default value: NULL
-
-
-
-The "client-cert" property
-  "client-cert"              GArray_guchar_*       : Read / Write
+
+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+
+
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
filename : the path of the private key file (PEM, DER, or PKCS12 format).
+  Passing NULL clears the private key.
+
password : password used to decrypt the private key
+
out_ck_type : on successful return, the type of the private key added
+
error : on unsuccessful return, an error
+
Returns :  TRUE if the operation succeeded, FALSE if it was unsuccessful
+
+
+
+
+nm_setting_802_1x_get_private_key_type ()
+NMSetting8021xCKType  nm_setting_802_1x_get_private_key_type
+                                                        (NMSetting8021x *setting);
+
+Warning
+nm_setting_802_1x_get_private_key_type has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_private_key_format().
+
+
++
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
Returns :  the data format of the private key data stored in the
+  "private-key" property
+
+
+
+
+nm_setting_802_1x_get_phase2_private_key ()
+const GByteArray *  nm_setting_802_1x_get_phase2_private_key
+                                                        (NMSetting8021x *setting);
+
+Warning
+nm_setting_802_1x_get_phase2_private_key has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_private_key_blob().
+
+
+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+
+
++
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
Returns :  the "phase 2" private key data
+
+
+
+
+nm_setting_802_1x_set_phase2_private_key_from_file ()
+gboolean            nm_setting_802_1x_set_phase2_private_key_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         const char *password,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+
+Warning
+nm_setting_802_1x_set_phase2_private_key_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_set_phase2_private_key() with
+  the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.
+
+
+Reads a "phase 2" private key from disk and sets the
+"phase2-private-key" property with the raw private key data.
+
+
+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+
+
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
filename : the path of the "phase2" private key file (PEM, DER, or PKCS12
+  format).  Passing NULL clears the "phase2" private key.
+
password : password used to decrypt the private key
+
out_ck_type : on successful return, the type of the private key added
+
error : on unsuccessful return, an error
+
Returns :  TRUE if the operation succeeded, FALSE if it was unsuccessful
+
+
+
+
+nm_setting_802_1x_get_phase2_private_key_type ()
+NMSetting8021xCKType  nm_setting_802_1x_get_phase2_private_key_type
+                                                        (NMSetting8021x *setting);
+
+Warning
+nm_setting_802_1x_get_phase2_private_key_type has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_phase2_private_key_format().
+
+
++
+
+
+
+
+
+
+
+
+
+
setting : the NMSetting8021x
+
Returns :  the data format of the private key data stored in the
+  "phase2-private-key" property
+
+
+
+
+Property Details
+
+The "anonymous-identity" property
+  "anonymous-identity"       gchar*                : Read / Write
+
+Anonymous identity string for EAP authentication methods.  Used as the
+unencrypted identity with EAP types that support different tunneled
+identity like EAP-TTLS.
+
+Default value: NULL
+
+
+
+The "ca-cert" property
+  "ca-cert"                  GArray_guchar_*       : Read / Write
+
+Contains the CA certificate if used by the EAP method specified in the
+"eap" property.  Setting this property directly is
+discouraged; use the nm_setting_802_1x_set_ca_cert() function instead.
+
+
+
+
+The "ca-path" property
+  "ca-path"                  gchar*                : Read / Write
+
+UTF-8 encoded path to a directory containing PEM or DER formatted
+certificates to be added to the verification chain in addition to the
+certificate specified in the "ca-cert" property.
+
+Default value: NULL
+
+
+
+The "client-cert" property
+  "client-cert"              GArray_guchar_*       : Read / Write
 
 Contains the client certificate if used by the EAP method specified in
 the "eap" property.  Setting this property directly is
@@ -2107,7 +2628,7 @@ discouraged; use the 
+

 The "eap" property
   "eap"                      GSList_gchararray_*   : Read / Write
 
@@ -2119,7 +2640,7 @@ allowed combinations.
 
 
 
-
+
 The "identity" property
   "identity"                 gchar*                : Read / Write
 
@@ -2129,7 +2650,7 @@ user or login name.
 
Default value: NULL
 
 
-
+
 The "password" property
   "password"                 gchar*                : Read / Write
 
@@ -2138,17 +2659,7 @@ Password used for EAP authentication methods.
 
Default value: NULL
 
 
-
-The "password-flags" property
-  "password-flags"           guint                 : Read / Write
-
-Flags indicating how to handle "password":.
-
-Allowed values: <= 7
-Default value: 0
-
-
-
+
 The "phase1-fast-provisioning" property
   "phase1-fast-provisioning" gchar*                : Read / Write
 
@@ -2162,7 +2673,7 @@ wpa_supplicant documentation for more details.
 
Default value: NULL
 
 
-
+
 The "phase1-peaplabel" property
   "phase1-peaplabel"         gchar*                : Read / Write
 
@@ -2174,7 +2685,7 @@ wpa_supplicant documentation for more details.
 
Default value: NULL
 
 
-
+
 The "phase1-peapver" property
   "phase1-peapver"           gchar*                : Read / Write
 
@@ -2188,7 +2699,7 @@ version.
 
Default value: NULL
 
 
-
+
 The "phase2-auth" property
   "phase2-auth"              gchar*                : Read / Write
 
@@ -2202,7 +2713,7 @@ authentication; see the wpa_supplicant documentation for more details.
 
Default value: NULL
 
 
-
+
 The "phase2-autheap" property
   "phase2-autheap"           gchar*                : Read / Write
 
@@ -2216,7 +2727,7 @@ wpa_supplicant documentation for more details.
 
Default value: NULL
 
 
-
+
 The "phase2-ca-cert" property
   "phase2-ca-cert"           GArray_guchar_*       : Read / Write
 
@@ -2227,7 +2738,7 @@ Setting this property directly is discouraged; use the
 
 
 
-
+
 The "phase2-ca-path" property
   "phase2-ca-path"           gchar*                : Read / Write
 
@@ -2238,7 +2749,7 @@ certificate specified in the 
+

 The "phase2-client-cert" property
   "phase2-client-cert"       GArray_guchar_*       : Read / Write
 
@@ -2249,7 +2760,7 @@ properties.  Setting this property directly is discouraged; use the
 
 
 
-
+
 The "phase2-private-key" property
   "phase2-private-key"       GArray_guchar_*       : Read / Write
 
@@ -2263,7 +2774,7 @@ property directly is discouraged; use the
 
 
 
-
+
 The "phase2-private-key-password" property
   "phase2-private-key-password" gchar*                : Read / Write
 
@@ -2277,17 +2788,7 @@ the private key by the 
-
The "phase2-private-key-password-flags" property
-  "phase2-private-key-password-flags" guint                 : Read / Write
-
-Flags indicating how to handle "phase2-private-key-password":.
-
-Allowed values: <= 7
-Default value: 0
-
-
-
+
 The "private-key" property
   "private-key"              GArray_guchar_*       : Read / Write
 
@@ -2295,16 +2796,9 @@ Contains the private key if the nm_setting_802_1x_set_private_key() function instead.
 
-
-WARNING: "private-key" is not a "secret" property, and thus
-unencrypted private key data using the BLOB scheme may be readable by
-unprivileged users.  Private keys should always be encrypted with a
-private key password to prevent unauthorized access to unencrypted
-private key data.
-
 
 
-
+
 The "private-key-password" property
   "private-key-password"     gchar*                : Read / Write
 
@@ -2318,17 +2812,7 @@ the private key by the 
-
The "private-key-password-flags" property
-  "private-key-password-flags" guint                 : Read / Write
-
-Flags indicating how to handle "private-key-password":.
-
-Allowed values: <= 7
-Default value: 0
-
-
-
+
 The "system-ca-certs" property
   "system-ca-certs"          gboolean              : Read / Write / Construct
 
@@ -2346,6 +2830,6 @@ addition to any certificates specified by the 
 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
-- 
cgit 1.3.0-6-gf8a5

`value` :	when `scheme` is set to either `NM_SETTING_802_1X_CK_SCHEME_PATH` or -`NM_SETTING_802_1X_CK_SCHEME_BLOB`, pass the path of the CA certificate file -(PEM or DER format). The path must be UTF-8 encoded; use -`g_filename_to_utf8()` to convert if needed. Passing NULL with any `scheme` -clears the CA certificate.	when `scheme` is set to either `NM_SETTING_802_1X_CK_SCHEME_PATH` or + `NM_SETTING_802_1X_CK_SCHEME_BLOB`, pass the path of the CA certificate file + (PEM or DER format). The path must be UTF-8 encoded; use + `g_filename_to_utf8()` to convert if needed. Passing NULL with any `scheme` + clears the CA certificate. +
`scheme` :	desired storage scheme for the certificate	desired storage scheme for the certificate +
`out_format` :	on successful return, the type of the certificate added	on successful return, the type of the certificate added +
`error` :	on unsuccessful return, an error	on unsuccessful return, an error +
Returns :	TRUE if the operation succeeded, FALSE if it was unsuccessful	TRUE if the operation succeeded, FALSE if it was unsuccessful +

`setting` :	the NMSetting8021x -
Returns :	the NMSettingSecretFlags pertaining to the "password" +	the password used by the authentication method, if any, as specified + by the "password" property

`setting` :	the NMSetting8021x +	on unsuccessful return, an error
Returns :	the private key password used to decrypt the private key if -previously set with `nm_setting_802_1x_set_private_key_from_file()`, -`nm_setting_802_1x_set_private_key_path()`, or the -"private-key-password" property.	TRUE if the operation succeeded, FALSE if it was unsuccessful +

`setting` :	the NMSetting8021x +
`filename` :	the path of the CA certificate file (PEM or DER format). Passing + NULL clears the CA certificate. +
`out_ck_type` :	on successful return, the type of the certificate added +
`error` :	on unsuccessful return, an error +
Returns :	TRUE if the operation succeeded, FALSE if it was unsuccessful +