summaryrefslogtreecommitdiff
path: root/docs/libnm-util/html/NMSetting8021x.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/libnm-util/html/NMSetting8021x.html')
-rw-r--r--docs/libnm-util/html/NMSetting8021x.html1536
1 files changed, 1010 insertions, 526 deletions
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index 8ef172c14..aec1b96e2 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="libnm-util API Reference">
<link rel="prev" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
<link rel="next" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
<a href="#NMSetting8021x.properties" class="shortcut">Properties</a>
</td></tr>
</table>
-<div class="refentry">
+<div class="refentry" title="NMSetting8021x">
<a name="NMSetting8021x"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
@@ -39,15 +39,15 @@
</td>
<td valign="top" align="right"></td>
</tr></table></div>
-<div class="refsynopsisdiv">
+<div class="refsynopsisdiv" title="Synopsis">
<a name="NMSetting8021x.synopsis"></a><h2>Synopsis</h2>
-<a name="NMSetting8021xError"></a><pre class="synopsis">
+<pre class="synopsis">
#include &lt;nm-setting-8021x.h&gt;
enum <a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat">NMSetting8021xCKFormat</a>;
enum <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme">NMSetting8021xCKScheme</a>;
#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-SETTING-NAME:CAPS" title="NM_SETTING_802_1X_SETTING_NAME">NM_SETTING_802_1X_SETTING_NAME</a>
-enum <a class="link" href="NMSetting8021x.html#NMSetting8021xError">NMSetting8021xError</a>;
+enum <a class="link" href="NMSetting8021x.html#NMSetting8021xError" title="enum NMSetting8021xError">NMSetting8021xError</a>;
#define <a class="link" href="NMSetting8021x.html#NM-TYPE-SETTING-802-1X-ERROR:CAPS" title="NM_TYPE_SETTING_802_1X_ERROR">NM_TYPE_SETTING_802_1X_ERROR</a>
#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-ERROR:CAPS" title="NM_SETTING_802_1X_ERROR">NM_SETTING_802_1X_ERROR</a>
<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-error-quark" title="nm_setting_802_1x_error_quark ()">nm_setting_802_1x_error_quark</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -66,15 +66,12 @@ enum <a class="link" href="NMSetting8021x.html#NMSetting8021xErro
#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS" title="NM_SETTING_802_1X_PHASE2_CA_PATH">NM_SETTING_802_1X_PHASE2_CA_PATH</a>
#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS" title="NM_SETTING_802_1X_PHASE2_CLIENT_CERT">NM_SETTING_802_1X_PHASE2_CLIENT_CERT</a>
#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD:CAPS" title="NM_SETTING_802_1X_PASSWORD">NM_SETTING_802_1X_PASSWORD</a>
-#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PASSWORD_FLAGS">NM_SETTING_802_1X_PASSWORD_FLAGS</a>
#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY">NM_SETTING_802_1X_PRIVATE_KEY</a>
#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD">NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD</a>
-#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS">NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS</a>
#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY">NM_SETTING_802_1X_PHASE2_PRIVATE_KEY</a>
#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD">NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD</a>
-#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS">NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS</a>
#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS" title="NM_SETTING_802_1X_PIN">NM_SETTING_802_1X_PIN</a>
-#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS" title="NM_SETTING_802_1X_PIN_FLAGS">NM_SETTING_802_1X_PIN_FLAGS</a>
+#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PSK:CAPS" title="NM_SETTING_802_1X_PSK">NM_SETTING_802_1X_PSK</a>
#define <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS" title="NM_SETTING_802_1X_SYSTEM_CA_CERTS">NM_SETTING_802_1X_SYSTEM_CA_CERTS</a>
<a class="link" href="NMSetting8021x.html#NMSetting8021x-struct" title="NMSetting8021x">NMSetting8021x</a>;
<a class="link" href="NMSetting8021x.html#NMSetting8021xClass" title="NMSetting8021xClass">NMSetting8021xClass</a>;
@@ -99,10 +96,8 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMSet
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-scheme" title="nm_setting_802_1x_get_ca_cert_scheme ()">nm_setting_802_1x_get_ca_cert_scheme</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()">nm_setting_802_1x_get_ca_cert_blob</a>
- (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()">nm_setting_802_1x_get_ca_cert_path</a>
- (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()">nm_setting_802_1x_get_ca_cert_blob</a> (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()">nm_setting_802_1x_get_ca_cert_path</a> (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert" title="nm_setting_802_1x_set_ca_cert ()">nm_setting_802_1x_set_ca_cert</a> (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
<em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
@@ -110,9 +105,9 @@ const <span class="returnvalue">char</span> * <a class="link" href="N
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-scheme" title="nm_setting_802_1x_get_client_cert_scheme ()">nm_setting_802_1x_get_client_cert_scheme</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()">nm_setting_802_1x_get_client_cert_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()">nm_setting_802_1x_get_client_cert_blob</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()">nm_setting_802_1x_get_client_cert_path</a>
+const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()">nm_setting_802_1x_get_client_cert_path</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert" title="nm_setting_802_1x_set_client_cert ()">nm_setting_802_1x_set_client_cert</a> (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
@@ -130,9 +125,9 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMSet
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-scheme" title="nm_setting_802_1x_get_phase2_ca_cert_scheme ()">nm_setting_802_1x_get_phase2_ca_cert_scheme</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-blob" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()">nm_setting_802_1x_get_phase2_ca_cert_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-blob" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()">nm_setting_802_1x_get_phase2_ca_cert_blob</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-path" title="nm_setting_802_1x_get_phase2_ca_cert_path ()">nm_setting_802_1x_get_phase2_ca_cert_path</a>
+const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-path" title="nm_setting_802_1x_get_phase2_ca_cert_path ()">nm_setting_802_1x_get_phase2_ca_cert_path</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert" title="nm_setting_802_1x_set_phase2_ca_cert ()">nm_setting_802_1x_set_phase2_ca_cert</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -142,9 +137,9 @@ const <span class="returnvalue">char</span> * <a class="link" href="N
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-scheme" title="nm_setting_802_1x_get_phase2_client_cert_scheme ()">nm_setting_802_1x_get_phase2_client_cert_scheme</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-blob" title="nm_setting_802_1x_get_phase2_client_cert_blob ()">nm_setting_802_1x_get_phase2_client_cert_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-blob" title="nm_setting_802_1x_get_phase2_client_cert_blob ()">nm_setting_802_1x_get_phase2_client_cert_blob</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-path" title="nm_setting_802_1x_get_phase2_client_cert_path ()">nm_setting_802_1x_get_phase2_client_cert_path</a>
+const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-path" title="nm_setting_802_1x_get_phase2_client_cert_path ()">nm_setting_802_1x_get_phase2_client_cert_path</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert" title="nm_setting_802_1x_set_phase2_client_cert ()">nm_setting_802_1x_set_phase2_client_cert</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -153,15 +148,13 @@ const <span class="returnvalue">char</span> * <a class="link" href="N
<em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-password" title="nm_setting_802_1x_get_password ()">nm_setting_802_1x_get_password</a> (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-password-flags" title="nm_setting_802_1x_get_password_flags ()">nm_setting_802_1x_get_password_flags</a>
- (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-pin" title="nm_setting_802_1x_get_pin ()">nm_setting_802_1x_get_pin</a> (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-pin-flags" title="nm_setting_802_1x_get_pin_flags ()">nm_setting_802_1x_get_pin_flags</a> (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-psk" title="nm_setting_802_1x_get_psk ()">nm_setting_802_1x_get_psk</a> (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme" title="nm_setting_802_1x_get_private_key_scheme ()">nm_setting_802_1x_get_private_key_scheme</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob" title="nm_setting_802_1x_get_private_key_blob ()">nm_setting_802_1x_get_private_key_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob" title="nm_setting_802_1x_get_private_key_blob ()">nm_setting_802_1x_get_private_key_blob</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path" title="nm_setting_802_1x_get_private_key_path ()">nm_setting_802_1x_get_private_key_path</a>
+const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path" title="nm_setting_802_1x_get_private_key_path ()">nm_setting_802_1x_get_private_key_path</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()">nm_setting_802_1x_set_private_key</a> (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
@@ -169,17 +162,15 @@ const <span class="returnvalue">char</span> * <a class="link" href="N
<em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
<em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password" title="nm_setting_802_1x_get_private_key_password ()">nm_setting_802_1x_get_private_key_password</a>
- (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password-flags" title="nm_setting_802_1x_get_private_key_password_flags ()">nm_setting_802_1x_get_private_key_password_flags</a>
+const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password" title="nm_setting_802_1x_get_private_key_password ()">nm_setting_802_1x_get_private_key_password</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-format" title="nm_setting_802_1x_get_private_key_format ()">nm_setting_802_1x_get_private_key_format</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme" title="nm_setting_802_1x_get_phase2_private_key_scheme ()">nm_setting_802_1x_get_phase2_private_key_scheme</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob" title="nm_setting_802_1x_get_phase2_private_key_blob ()">nm_setting_802_1x_get_phase2_private_key_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob" title="nm_setting_802_1x_get_phase2_private_key_blob ()">nm_setting_802_1x_get_phase2_private_key_blob</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path" title="nm_setting_802_1x_get_phase2_private_key_path ()">nm_setting_802_1x_get_phase2_private_key_path</a>
+const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path" title="nm_setting_802_1x_get_phase2_private_key_path ()">nm_setting_802_1x_get_phase2_private_key_path</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()">nm_setting_802_1x_set_phase2_private_key</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -188,27 +179,67 @@ const <span class="returnvalue">char</span> * <a class="link" href="N
<em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
<em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password" title="nm_setting_802_1x_get_phase2_private_key_password ()">nm_setting_802_1x_get_phase2_private_key_password</a>
- (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags" title="nm_setting_802_1x_get_phase2_private_key_password_flags ()">nm_setting_802_1x_get_phase2_private_key_password_flags</a>
+const <span class="returnvalue">char</span> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password" title="nm_setting_802_1x_get_phase2_private_key_password ()">nm_setting_802_1x_get_phase2_private_key_password</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format" title="nm_setting_802_1x_get_phase2_private_key_format ()">nm_setting_802_1x_get_phase2_private_key_format</a>
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+enum <a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType">NMSetting8021xCKType</a>;
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert" title="nm_setting_802_1x_get_ca_cert ()">nm_setting_802_1x_get_ca_cert</a> (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert-from-file" title="nm_setting_802_1x_set_ca_cert_from_file ()">nm_setting_802_1x_set_ca_cert_from_file</a>
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert" title="nm_setting_802_1x_get_client_cert ()">nm_setting_802_1x_get_client_cert</a> (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert-from-file" title="nm_setting_802_1x_set_client_cert_from_file ()">nm_setting_802_1x_set_client_cert_from_file</a>
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert" title="nm_setting_802_1x_get_phase2_ca_cert ()">nm_setting_802_1x_get_phase2_ca_cert</a>
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert-from-file" title="nm_setting_802_1x_set_phase2_ca_cert_from_file ()">nm_setting_802_1x_set_phase2_ca_cert_from_file</a>
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert" title="nm_setting_802_1x_get_phase2_client_cert ()">nm_setting_802_1x_get_phase2_client_cert</a>
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert-from-file" title="nm_setting_802_1x_set_phase2_client_cert_from_file ()">nm_setting_802_1x_set_phase2_client_cert_from_file</a>
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key" title="nm_setting_802_1x_get_private_key ()">nm_setting_802_1x_get_private_key</a> (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file" title="nm_setting_802_1x_set_private_key_from_file ()">nm_setting_802_1x_set_private_key_from_file</a>
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="returnvalue">NMSetting8021xCKType</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-type" title="nm_setting_802_1x_get_private_key_type ()">nm_setting_802_1x_get_private_key_type</a>
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key" title="nm_setting_802_1x_get_phase2_private_key ()">nm_setting_802_1x_get_phase2_private_key</a>
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file" title="nm_setting_802_1x_set_phase2_private_key_from_file ()">nm_setting_802_1x_set_phase2_private_key_from_file</a>
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="returnvalue">NMSetting8021xCKType</span></a> <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-type" title="nm_setting_802_1x_get_phase2_private_key_type ()">nm_setting_802_1x_get_phase2_private_key_type</a>
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
</pre>
</div>
-<div class="refsect1">
+<div class="refsect1" title="Object Hierarchy">
<a name="NMSetting8021x.object-hierarchy"></a><h2>Object Hierarchy</h2>
<pre class="synopsis">
- GEnum
- +----NMSetting8021xError
-</pre>
-<pre class="synopsis">
<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+----NMSetting8021x
</pre>
</div>
-<div class="refsect1">
+<div class="refsect1" title="Properties">
<a name="NMSetting8021x.properties"></a><h2>Properties</h2>
<pre class="synopsis">
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--anonymous-identity" title='The "anonymous-identity" property'>anonymous-identity</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
@@ -218,7 +249,6 @@ const <span class="returnvalue">char</span> * <a class="link" href="N
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title='The "eap" property'>eap</a>" <span class="type">GSList_gchararray_</span>* : Read / Write
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--identity" title='The "identity" property'>identity</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'>password</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
- "<a class="link" href="NMSetting8021x.html#NMSetting8021x--password-flags" title='The "password-flags" property'>password-flags</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title='The "phase1-fast-provisioning" property'>phase1-fast-provisioning</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel" title='The "phase1-peaplabel" property'>phase1-peaplabel</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peapver" title='The "phase1-peapver" property'>phase1-peapver</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
@@ -229,14 +259,12 @@ const <span class="returnvalue">char</span> * <a class="link" href="N
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-client-cert" title='The "phase2-client-cert" property'>phase2-client-cert</a>" <span class="type">GArray_guchar_</span>* : Read / Write
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'>phase2-private-key</a>" <span class="type">GArray_guchar_</span>* : Read / Write
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'>phase2-private-key-password</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
- "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password-flags" title='The "phase2-private-key-password-flags" property'>phase2-private-key-password-flags</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'>private-key</a>" <span class="type">GArray_guchar_</span>* : Read / Write
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'>private-key-password</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
- "<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password-flags" title='The "private-key-password-flags" property'>private-key-password-flags</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write
"<a class="link" href="NMSetting8021x.html#NMSetting8021x--system-ca-certs" title='The "system-ca-certs" property'>system-ca-certs</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write / Construct
</pre>
</div>
-<div class="refsect1">
+<div class="refsect1" title="Description">
<a name="NMSetting8021x.description"></a><h2>Description</h2>
<p>
The <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes
@@ -267,9 +295,9 @@ following books.
ISBN: 978-1587051548
</p>
</div>
-<div class="refsect1">
+<div class="refsect1" title="Details">
<a name="NMSetting8021x.details"></a><h2>Details</h2>
-<div class="refsect2">
+<div class="refsect2" title="enum NMSetting8021xCKFormat">
<a name="NMSetting8021xCKFormat"></a><h3>enum NMSetting8021xCKFormat</h3>
<pre class="programlisting">typedef enum {
NM_SETTING_802_1X_CK_FORMAT_UNKNOWN = 0,
@@ -279,39 +307,10 @@ following books.
} NMSetting8021xCKFormat;
</pre>
<p>
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> values indicate the general type of a certificate
-or private key
</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><a name="NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_UNKNOWN</code></span></p></td>
-<td>unknown file format
-</td>
-</tr>
-<tr>
-<td><p><a name="NM-SETTING-802-1X-CK-FORMAT-X509:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_X509</code></span></p></td>
-<td>file contains an X.509 format certificate
-</td>
-</tr>
-<tr>
-<td><p><a name="NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_RAW_KEY</code></span></p></td>
-<td>file contains an old-style OpenSSL PEM
-or DER private key
-</td>
-</tr>
-<tr>
-<td><p><a name="NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_PKCS12</code></span></p></td>
-<td>file contains a PKCS<span class="type">12</span> certificate
-and private key
-</td>
-</tr>
-</tbody>
-</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="enum NMSetting8021xCKScheme">
<a name="NMSetting8021xCKScheme"></a><h3>enum NMSetting8021xCKScheme</h3>
<pre class="programlisting">typedef enum {
NM_SETTING_802_1X_CK_SCHEME_UNKNOWN = 0,
@@ -320,36 +319,10 @@ and private key
} NMSetting8021xCKScheme;
</pre>
<p>
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> 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
</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><a name="NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_UNKNOWN</code></span></p></td>
-<td>unknown certificate or private key
-scheme
-</td>
-</tr>
-<tr>
-<td><p><a name="NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></span></p></td>
-<td>certificate or key is stored as the raw
-item data
-</td>
-</tr>
-<tr>
-<td><p><a name="NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></span></p></td>
-<td>certificate or key is stored as a path
-to a file containing the certificate or key data
-</td>
-</tr>
-</tbody>
-</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_SETTING_NAME">
<a name="NM-SETTING-802-1X-SETTING-NAME:CAPS"></a><h3>NM_SETTING_802_1X_SETTING_NAME</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
</pre>
@@ -357,7 +330,7 @@ to a file containing the certificate or key data
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="enum NMSetting8021xError">
<a name="NMSetting8021xError"></a><h3>enum NMSetting8021xError</h3>
<pre class="programlisting">typedef enum
{
@@ -370,7 +343,7 @@ to a file containing the certificate or key data
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_TYPE_SETTING_802_1X_ERROR">
<a name="NM-TYPE-SETTING-802-1X-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_802_1X_ERROR</h3>
<pre class="programlisting">#define NM_TYPE_SETTING_802_1X_ERROR (nm_setting_802_1x_error_get_type ())
</pre>
@@ -378,7 +351,7 @@ to a file containing the certificate or key data
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_ERROR">
<a name="NM-SETTING-802-1X-ERROR:CAPS"></a><h3>NM_SETTING_802_1X_ERROR</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
</pre>
@@ -386,7 +359,7 @@ to a file containing the certificate or key data
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_error_quark ()">
<a name="nm-setting-802-1x-error-quark"></a><h3>nm_setting_802_1x_error_quark ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> nm_setting_802_1x_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
<p>
@@ -396,12 +369,13 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
<col align="left" valign="top">
<tbody><tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the error quark used for <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> errors.</td>
+<td> the error quark used for <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> errors.
+</td>
</tr></tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_EAP">
<a name="NM-SETTING-802-1X-EAP:CAPS"></a><h3>NM_SETTING_802_1X_EAP</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_EAP "eap"
</pre>
@@ -409,7 +383,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_IDENTITY">
<a name="NM-SETTING-802-1X-IDENTITY:CAPS"></a><h3>NM_SETTING_802_1X_IDENTITY</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_IDENTITY "identity"
</pre>
@@ -417,7 +391,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_ANONYMOUS_IDENTITY">
<a name="NM-SETTING-802-1X-ANONYMOUS-IDENTITY:CAPS"></a><h3>NM_SETTING_802_1X_ANONYMOUS_IDENTITY</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
</pre>
@@ -425,7 +399,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_CA_CERT">
<a name="NM-SETTING-802-1X-CA-CERT:CAPS"></a><h3>NM_SETTING_802_1X_CA_CERT</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_CA_CERT "ca-cert"
</pre>
@@ -433,7 +407,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_CA_PATH">
<a name="NM-SETTING-802-1X-CA-PATH:CAPS"></a><h3>NM_SETTING_802_1X_CA_PATH</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_CA_PATH "ca-path"
</pre>
@@ -441,7 +415,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_CLIENT_CERT">
<a name="NM-SETTING-802-1X-CLIENT-CERT:CAPS"></a><h3>NM_SETTING_802_1X_CLIENT_CERT</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
</pre>
@@ -449,7 +423,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PHASE1_PEAPVER">
<a name="NM-SETTING-802-1X-PHASE1-PEAPVER:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_PEAPVER</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
</pre>
@@ -457,7 +431,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PHASE1_PEAPLABEL">
<a name="NM-SETTING-802-1X-PHASE1-PEAPLABEL:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_PEAPLABEL</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
</pre>
@@ -465,7 +439,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING">
<a name="NM-SETTING-802-1X-PHASE1-FAST-PROVISIONING:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
</pre>
@@ -473,7 +447,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_AUTH">
<a name="NM-SETTING-802-1X-PHASE2-AUTH:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_AUTH</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
</pre>
@@ -481,7 +455,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_AUTHEAP">
<a name="NM-SETTING-802-1X-PHASE2-AUTHEAP:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_AUTHEAP</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
</pre>
@@ -489,7 +463,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_CA_CERT">
<a name="NM-SETTING-802-1X-PHASE2-CA-CERT:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CA_CERT</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
</pre>
@@ -497,7 +471,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_CA_PATH">
<a name="NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CA_PATH</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
</pre>
@@ -505,7 +479,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_CLIENT_CERT">
<a name="NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CLIENT_CERT</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
</pre>
@@ -513,7 +487,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PASSWORD">
<a name="NM-SETTING-802-1X-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD "password"
</pre>
@@ -521,15 +495,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
-<a name="NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD_FLAGS</h3>
-<pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PRIVATE_KEY">
<a name="NM-SETTING-802-1X-PRIVATE-KEY:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
</pre>
@@ -537,7 +503,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD">
<a name="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
</pre>
@@ -545,15 +511,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
-<a name="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS</h3>
-<pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY">
<a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
</pre>
@@ -561,7 +519,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD">
<a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
</pre>
@@ -569,15 +527,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
-<a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS</h3>
-<pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_PIN">
<a name="NM-SETTING-802-1X-PIN:CAPS"></a><h3>NM_SETTING_802_1X_PIN</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_PIN "pin"
</pre>
@@ -585,15 +535,15 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
-<a name="NM-SETTING-802-1X-PIN-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PIN_FLAGS</h3>
-<pre class="programlisting">#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
+<div class="refsect2" title="NM_SETTING_802_1X_PSK">
+<a name="NM-SETTING-802-1X-PSK:CAPS"></a><h3>NM_SETTING_802_1X_PSK</h3>
+<pre class="programlisting">#define NM_SETTING_802_1X_PSK "psk"
</pre>
<p>
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NM_SETTING_802_1X_SYSTEM_CA_CERTS">
<a name="NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS"></a><h3>NM_SETTING_802_1X_SYSTEM_CA_CERTS</h3>
<pre class="programlisting">#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
</pre>
@@ -601,14 +551,14 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NMSetting8021x">
<a name="NMSetting8021x-struct"></a><h3>NMSetting8021x</h3>
<pre class="programlisting">typedef struct _NMSetting8021x NMSetting8021x;</pre>
<p>
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="NMSetting8021xClass">
<a name="NMSetting8021xClass"></a><h3>NMSetting8021xClass</h3>
<pre class="programlisting">typedef struct {
NMSettingClass parent;
@@ -624,14 +574,22 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_type ()">
<a name="nm-setting-802-1x-get-type"></a><h3>nm_setting_802_1x_get_type ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> nm_setting_802_1x_get_type (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
<p>
</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_new ()">
<a name="nm-setting-802-1x-new"></a><h3>nm_setting_802_1x_new ()</h3>
<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> * nm_setting_802_1x_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
<p>
@@ -641,12 +599,13 @@ Creates a new <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">
<col align="left" valign="top">
<tbody><tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the new empty <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> object</td>
+<td> the new empty <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> object
+</td>
</tr></tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_num_eap_methods ()">
<a name="nm-setting-802-1x-get-num-eap-methods"></a><h3>nm_setting_802_1x_get_num_eap_methods ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> nm_setting_802_1x_get_num_eap_methods
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -667,13 +626,14 @@ allowed EAP methods.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the number of allowed EAP methods</td>
+<td> the number of allowed EAP methods
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_eap_method ()">
<a name="nm-setting-802-1x-get-eap-method"></a><h3>nm_setting_802_1x_get_eap_method ()</h3>
<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_eap_method (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
@@ -690,18 +650,19 @@ Returns the name of the allowed EAP method at index <em class="parameter"><code>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>the index of the EAP method name to return</td>
+<td>the index of the EAP method name to return
+</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the name of the allowed EAP method at index <em class="parameter"><code>i</code></em>
+<td> the name of the allowed EAP method at index <em class="parameter"><code>i</code></em>
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_add_eap_method ()">
<a name="nm-setting-802-1x-add-eap-method"></a><h3>nm_setting_802_1x_add_eap_method ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_add_eap_method (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *eap</code></em>);</pre>
@@ -720,18 +681,20 @@ allowed EAP methods.
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>eap</code></em> :</span></p></td>
-<td>the name of the EAP method to allow for this connection</td>
+<td>the name of the EAP method to allow for this connection
+</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the EAP method was successfully added, FALSE if it was
-not a valid method or if it was already allowed.</td>
+<td> TRUE if the EAP method was successfully added, FALSE if it was
+ not a valid method or if it was already allowed.
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_remove_eap_method ()">
<a name="nm-setting-802-1x-remove-eap-method"></a><h3>nm_setting_802_1x_remove_eap_method ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span> nm_setting_802_1x_remove_eap_method (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
@@ -748,13 +711,14 @@ Removes the allowed EAP method at the specified index.
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>the index of the EAP method to remove</td>
+<td>the index of the EAP method to remove
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_clear_eap_methods ()">
<a name="nm-setting-802-1x-clear-eap-methods"></a><h3>nm_setting_802_1x_clear_eap_methods ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span> nm_setting_802_1x_clear_eap_methods (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
@@ -770,7 +734,7 @@ Clears all allowed EAP methods.
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_identity ()">
<a name="nm-setting-802-1x-get-identity"></a><h3>nm_setting_802_1x_get_identity ()</h3>
<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_identity (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
@@ -787,13 +751,14 @@ authenticate the user. Often this is a username or login name.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the user identifier</td>
+<td> the user identifier
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_anonymous_identity ()">
<a name="nm-setting-802-1x-get-anonymous-identity"></a><h3>nm_setting_802_1x_get_anonymous_identity ()</h3>
<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_anonymous_identity
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -813,13 +778,14 @@ a secure form, if applicable for that EAP method.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the anonymous identifier</td>
+<td> the anonymous identifier
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_system_ca_certs ()">
<a name="nm-setting-802-1x-get-system-ca-certs"></a><h3>nm_setting_802_1x_get_system_ca_certs ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_get_system_ca_certs
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -841,13 +807,14 @@ of these properties.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if a system CA certificate path should be used, FALSE if not</td>
+<td> TRUE if a system CA certificate path should be used, FALSE if not
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_ca_path ()">
<a name="nm-setting-802-1x-get-ca-path"></a><h3>nm_setting_802_1x_get_ca_path ()</h3>
<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_ca_path (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
@@ -867,13 +834,14 @@ certificates for verifying the network to client.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the CA certificate directory path</td>
+<td> the CA certificate directory path
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_path ()">
<a name="nm-setting-802-1x-get-phase2-ca-path"></a><h3>nm_setting_802_1x_get_phase2_ca_path ()</h3>
<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase2_ca_path
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -894,20 +862,21 @@ to add more CA certificates for verifying the network to client.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the "phase 2" CA certificate directory path</td>
+<td> the "phase 2" CA certificate directory path
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_ca_cert_scheme ()">
<a name="nm-setting-802-1x-get-ca-cert-scheme"></a><h3>nm_setting_802_1x_get_ca_cert_scheme ()</h3>
<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> nm_setting_802_1x_get_ca_cert_scheme
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Returns the scheme used to store the CA certificate. If the returned scheme
-is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>;
-if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()"><code class="function">nm_setting_802_1x_get_ca_cert_path()</code></a>.
+is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>;
+if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()"><code class="function">nm_setting_802_1x_get_ca_cert_path()</code></a>.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
@@ -919,19 +888,19 @@ if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CA
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>scheme used to store the CA certificate (blob or path)</td>
+<td> scheme used to store the CA certificate (blob or path)
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_ca_cert_blob ()">
<a name="nm-setting-802-1x-get-ca-cert-blob"></a><h3>nm_setting_802_1x_get_ca_cert_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_ca_cert_blob
- (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_ca_cert_blob (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Returns the CA certificate blob if the CA certificate is stored using the
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme. Not all EAP methods use a
+<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> 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.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the CA certificate data</td>
+<td> the CA certificate data
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_ca_cert_path ()">
<a name="nm-setting-802-1x-get-ca-cert-path"></a><h3>nm_setting_802_1x_get_ca_cert_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_ca_cert_path
- (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_ca_cert_path (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Returns the CA certificate path if the CA certificate is stored using the
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme. Not all EAP methods use a
+<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> 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.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>path to the CA certificate file</td>
+<td> path to the CA certificate file
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_set_ca_cert ()">
<a name="nm-setting-802-1x-set-ca-cert"></a><h3>nm_setting_802_1x_set_ca_cert ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_ca_cert (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
@@ -990,9 +960,9 @@ of the network cannot be confirmed by the client.
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
<p>
Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-cert" title='The "ca-cert" property'><span class="type">"ca-cert"</span></a> property
-with the raw certificate data if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>
+with the raw certificate data if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>
scheme, or with the path to the certificate file if using the
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
+<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
@@ -1004,40 +974,45 @@ scheme, or with the path to the certificate file if using the
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the CA certificate file
-(PEM or DER format). The path must be UTF-8 encoded; use
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed. Passing NULL with any <em class="parameter"><code>scheme</code></em>
-clears the CA certificate.</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
+ <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the CA certificate file
+ (PEM or DER format). The path must be UTF-8 encoded; use
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed. Passing NULL with any <em class="parameter"><code>scheme</code></em>
+ clears the CA certificate.
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the certificate</td>
+<td>desired storage scheme for the certificate
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added</td>
+<td>on successful return, the type of the certificate added
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error</td>
+<td>on unsuccessful return, an error
+</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
+<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_client_cert_scheme ()">
<a name="nm-setting-802-1x-get-client-cert-scheme"></a><h3>nm_setting_802_1x_get_client_cert_scheme ()</h3>
<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> nm_setting_802_1x_get_client_cert_scheme
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Returns the scheme used to store the client certificate. If the returned scheme
-is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>;
-if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
+is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>;
+if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
@@ -1049,15 +1024,16 @@ if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CA
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>scheme used to store the client certificate (blob or path)</td>
+<td> scheme used to store the client certificate (blob or path)
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_client_cert_blob ()">
<a name="nm-setting-802-1x-get-client-cert-blob"></a><h3>nm_setting_802_1x_get_client_cert_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_client_cert_blob
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_client_cert_blob
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Client certificates are used to identify the connecting client to the network
@@ -1074,15 +1050,16 @@ authentication method.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the client certificate data</td>
+<td> the client certificate data
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_client_cert_path ()">
<a name="nm-setting-802-1x-get-client-cert-path"></a><h3>nm_setting_802_1x_get_client_cert_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_client_cert_path
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_client_cert_path
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Client certificates are used to identify the connecting client to the network
@@ -1099,13 +1076,14 @@ authentication method.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>path to the client certificate file</td>
+<td> path to the client certificate file
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_set_client_cert ()">
<a name="nm-setting-802-1x-set-client-cert"></a><h3>nm_setting_802_1x_set_client_cert ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_client_cert (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
@@ -1115,8 +1093,8 @@ authentication method.
<p>
Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--client-cert" title='The "client-cert" property'><span class="type">"client-cert"</span></a>
property with the raw certificate data if using the
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the certificate
-file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
+<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the certificate
+file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
</p>
<p>
Client certificates are used to identify the connecting client to the network
@@ -1133,33 +1111,38 @@ authentication method.
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the client certificate
-file (PEM, DER, or PKCS<span class="type">12</span> format). The path must be UTF-8 encoded; use
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed. Passing NULL with any <em class="parameter"><code>scheme</code></em>
-clears the client certificate.</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
+ <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the client certificate
+ file (PEM, DER, or PKCS<span class="type">12</span> format). The path must be UTF-8 encoded; use
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed. Passing NULL with any <em class="parameter"><code>scheme</code></em>
+ clears the client certificate.
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the certificate</td>
+<td>desired storage scheme for the certificate
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added</td>
+<td>on successful return, the type of the certificate added
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error</td>
+<td>on unsuccessful return, an error
+</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
+<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_phase1_peapver ()">
<a name="nm-setting-802-1x-get-phase1-peapver"></a><h3>nm_setting_802_1x_get_phase1_peapver ()</h3>
<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase1_peapver
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -1173,15 +1156,16 @@ clears the client certificate.</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the "phase 1" PEAP version to be used when authenticating with
-EAP-PEAP as contained in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peapver" title='The "phase1-peapver" property'><span class="type">"phase1-peapver"</span></a> property. Valid
-values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).</td>
+<td> the "phase 1" PEAP version to be used when authenticating with
+ EAP-PEAP as contained in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peapver" title='The "phase1-peapver" property'><span class="type">"phase1-peapver"</span></a> property. Valid
+ values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_phase1_peaplabel ()">
<a name="nm-setting-802-1x-get-phase1-peaplabel"></a><h3>nm_setting_802_1x_get_phase1_peaplabel ()</h3>
<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase1_peaplabel
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -1195,17 +1179,18 @@ values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>whether the "phase 1" PEAP label is new-style or old-style, to be
-used when authenticating with EAP-PEAP, as contained in the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel" title='The "phase1-peaplabel" property'><span class="type">"phase1-peaplabel"</span></a> 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.</td>
+<td> whether the "phase 1" PEAP label is new-style or old-style, to be
+ used when authenticating with EAP-PEAP, as contained in the
+ <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel" title='The "phase1-peaplabel" property'><span class="type">"phase1-peaplabel"</span></a> 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.
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_phase1_fast_provisioning ()">
<a name="nm-setting-802-1x-get-phase1-fast-provisioning"></a><h3>nm_setting_802_1x_get_phase1_fast_provisioning ()</h3>
<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase1_fast_provisioning
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -1219,15 +1204,16 @@ wpa_supplicant documentation for more details.</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>whether "phase 1" PEAP fast provisioning should be used, as specified
-by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title='The "phase1-fast-provisioning" property'><span class="type">"phase1-fast-provisioning"</span></a> property. See the
-wpa_supplicant documentation for more details.</td>
+<td> whether "phase 1" PEAP fast provisioning should be used, as specified
+ by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title='The "phase1-fast-provisioning" property'><span class="type">"phase1-fast-provisioning"</span></a> property. See the
+ wpa_supplicant documentation for more details.
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_auth ()">
<a name="nm-setting-802-1x-get-phase2-auth"></a><h3>nm_setting_802_1x_get_phase2_auth ()</h3>
<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase2_auth (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<div class="variablelist"><table border="0">
@@ -1240,14 +1226,15 @@ wpa_supplicant documentation for more details.</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the "phase 2" non-EAP (ex MD5) allowed authentication method as
-specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title='The "phase2-auth" property'><span class="type">"phase2-auth"</span></a> property.</td>
+<td> the "phase 2" non-EAP (ex MD5) allowed authentication method as
+ specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title='The "phase2-auth" property'><span class="type">"phase2-auth"</span></a> property.
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_autheap ()">
<a name="nm-setting-802-1x-get-phase2-autheap"></a><h3>nm_setting_802_1x_get_phase2_autheap ()</h3>
<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase2_autheap
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -1261,21 +1248,22 @@ specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the "phase 2" EAP-based (ex TLS) allowed authentication method as
-specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title='The "phase2-autheap" property'><span class="type">"phase2-autheap"</span></a> property.</td>
+<td> the "phase 2" EAP-based (ex TLS) allowed authentication method as
+ specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title='The "phase2-autheap" property'><span class="type">"phase2-autheap"</span></a> property.
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_cert_scheme ()">
<a name="nm-setting-802-1x-get-phase2-ca-cert-scheme"></a><h3>nm_setting_802_1x_get_phase2_ca_cert_scheme ()</h3>
<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> nm_setting_802_1x_get_phase2_ca_cert_scheme
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Returns the scheme used to store the "phase 2" CA certificate. If the
-returned scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>; if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>,
+returned scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>; if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>,
use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()"><code class="function">nm_setting_802_1x_get_ca_cert_path()</code></a>.
</p>
<div class="variablelist"><table border="0">
@@ -1288,19 +1276,20 @@ use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>scheme used to store the "phase 2" CA certificate (blob or path)</td>
+<td> scheme used to store the "phase 2" CA certificate (blob or path)
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()">
<a name="nm-setting-802-1x-get-phase2-ca-cert-blob"></a><h3>nm_setting_802_1x_get_phase2_ca_cert_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_phase2_ca_cert_blob
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_phase2_ca_cert_blob
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Returns the "phase 2" CA certificate blob if the CA certificate is stored
-using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme. Not all EAP methods use
+using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> 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.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the "phase 2" CA certificate data</td>
+<td> the "phase 2" CA certificate data
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_cert_path ()">
<a name="nm-setting-802-1x-get-phase2-ca-cert-path"></a><h3>nm_setting_802_1x_get_phase2_ca_cert_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase2_ca_cert_path
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase2_ca_cert_path
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Returns the "phase 2" CA certificate path if the CA certificate is stored
-using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme. Not all EAP methods use
+using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> 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.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>path to the "phase 2" CA certificate file</td>
+<td> path to the "phase 2" CA certificate file
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_set_phase2_ca_cert ()">
<a name="nm-setting-802-1x-set-phase2-ca-cert"></a><h3>nm_setting_802_1x_set_phase2_ca_cert ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_phase2_ca_cert
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -1361,8 +1352,8 @@ of the network cannot be confirmed by the client.
<p>
Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-cert" title='The "phase2-ca-cert" property'><span class="type">"phase2-ca-cert"</span></a>
property with the raw certificate data if using the
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the certificate
-file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
+<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the certificate
+file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
@@ -1374,41 +1365,46 @@ file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the "phase2" CA
-certificate file (PEM or DER format). The path must be UTF-8 encoded; use
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed. Passing NULL with any <em class="parameter"><code>scheme</code></em>
-clears the "phase2" CA certificate.</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
+ <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the "phase2" CA
+ certificate file (PEM or DER format). The path must be UTF-8 encoded; use
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed. Passing NULL with any <em class="parameter"><code>scheme</code></em>
+ clears the "phase2" CA certificate.
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the certificate</td>
+<td>desired storage scheme for the certificate
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added</td>
+<td>on successful return, the type of the certificate added
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error</td>
+<td>on unsuccessful return, an error
+</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
+<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_client_cert_scheme ()">
<a name="nm-setting-802-1x-get-phase2-client-cert-scheme"></a><h3>nm_setting_802_1x_get_phase2_client_cert_scheme ()</h3>
<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> nm_setting_802_1x_get_phase2_client_cert_scheme
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Returns the scheme used to store the "phase 2" client certificate. If the
-returned scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use
+returned scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>; if
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use
+<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use
<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
</p>
<div class="variablelist"><table border="0">
@@ -1421,15 +1417,16 @@ returned scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-C
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>scheme used to store the "phase 2" client certificate (blob or path)</td>
+<td> scheme used to store the "phase 2" client certificate (blob or path)
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_client_cert_blob ()">
<a name="nm-setting-802-1x-get-phase2-client-cert-blob"></a><h3>nm_setting_802_1x_get_phase2_client_cert_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_phase2_client_cert_blob
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_phase2_client_cert_blob
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Client certificates are used to identify the connecting client to the network
@@ -1446,15 +1443,16 @@ authentication method.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the "phase 2" client certificate data</td>
+<td> the "phase 2" client certificate data
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_client_cert_path ()">
<a name="nm-setting-802-1x-get-phase2-client-cert-path"></a><h3>nm_setting_802_1x_get_phase2_client_cert_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase2_client_cert_path
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase2_client_cert_path
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Client certificates are used to identify the connecting client to the network
@@ -1471,13 +1469,14 @@ authentication method.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>path to the "phase 2" client certificate file</td>
+<td> path to the "phase 2" client certificate file
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_set_phase2_client_cert ()">
<a name="nm-setting-802-1x-set-phase2-client-cert"></a><h3>nm_setting_802_1x_set_phase2_client_cert ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_phase2_client_cert
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -1488,8 +1487,8 @@ authentication method.
<p>
Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-client-cert" title='The "phase2-client-cert" property'><span class="type">"phase2-client-cert"</span></a>
property with the raw certificate data if using the
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the certificate
-file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
+<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the certificate
+file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
</p>
<p>
Client certificates are used to identify the connecting client to the network
@@ -1506,33 +1505,38 @@ authentication method.
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the "phase2" client
-certificate file (PEM, DER, or PKCS<span class="type">12</span> format). The path must be UTF-8
-encoded; use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed. Passing NULL with
-any <em class="parameter"><code>scheme</code></em> clears the "phase2" client certificate.</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
+ <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the "phase2" client
+ certificate file (PEM, DER, or PKCS<span class="type">12</span> format). The path must be UTF-8
+ encoded; use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed. Passing NULL with
+ any <em class="parameter"><code>scheme</code></em> clears the "phase2" client certificate.
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the certificate</td>
+<td>desired storage scheme for the certificate
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added</td>
+<td>on successful return, the type of the certificate added
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error</td>
+<td>on unsuccessful return, an error
+</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
+<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title="nm_setting_802_1x_get_password ()">
<a name="nm-setting-802-1x-get-password"></a><h3>nm_setting_802_1x_get_password ()</h3>
<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_password (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<div class="variablelist"><table border="0">
@@ -1545,17 +1549,67 @@ any <em class="parameter"><code>scheme</code></em> clears the "phase2" client ce
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the password used by the authentication method, if any, as specified
-by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'><span class="type">"password"</span></a> property</td>
+<td> the password used by the authentication method, if any, as specified
+ by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'><span class="type">"password"</span></a> property
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="nm_setting_802_1x_get_pin ()">
+<a name="nm-setting-802-1x-get-pin"></a><h3>nm_setting_802_1x_get_pin ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_pin (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the PIN used by the authentication method, if any, as specified
+ by the <span class="type">"pin"</span> property
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="nm_setting_802_1x_get_psk ()">
+<a name="nm-setting-802-1x-get-psk"></a><h3>nm_setting_802_1x_get_psk ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_psk (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the Pre-Shared-Key used by the authentication method, if any, as
+ specified by the <span class="type">"psk"</span> property
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-password-flags"></a><h3>nm_setting_802_1x_get_password_flags ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a> nm_setting_802_1x_get_password_flags
+<div class="refsect2" title="nm_setting_802_1x_get_private_key_scheme ()">
+<a name="nm-setting-802-1x-get-private-key-scheme"></a><h3>nm_setting_802_1x_get_private_key_scheme ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> nm_setting_802_1x_get_private_key_scheme
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<p>
+Returns the scheme used to store the private key. If the returned scheme is
+<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>; if
+<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
+</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -1566,16 +1620,22 @@ by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'><span class="type">"password"</span></a>
+<td> scheme used to store the private key (blob or path)
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-pin"></a><h3>nm_setting_802_1x_get_pin ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_pin (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="refsect2" title="nm_setting_802_1x_get_private_key_blob ()">
+<a name="nm-setting-802-1x-get-private-key-blob"></a><h3>nm_setting_802_1x_get_private_key_blob ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_private_key_blob
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<p>
+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.
+</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -1586,16 +1646,22 @@ by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the PIN used by the authentication method, if any, as specified
-by the <span class="type">"pin"</span> property</td>
+<td> the private key data
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-pin-flags"></a><h3>nm_setting_802_1x_get_pin_flags ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a> nm_setting_802_1x_get_pin_flags (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="refsect2" title="nm_setting_802_1x_get_private_key_path ()">
+<a name="nm-setting-802-1x-get-private-key-path"></a><h3>nm_setting_802_1x_get_private_key_path ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_private_key_path
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<p>
+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.
+</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -1606,23 +1672,133 @@ by the <span class="type">"pin"</span> property</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
-<span class="type">"pin"</span>
+<td> path to the private key file
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-private-key-scheme"></a><h3>nm_setting_802_1x_get_private_key_scheme ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> nm_setting_802_1x_get_private_key_scheme
+<div class="refsect2" title="nm_setting_802_1x_set_private_key ()">
+<a name="nm-setting-802-1x-set-private-key"></a><h3>nm_setting_802_1x_set_private_key ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_private_key (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>
+Reads a private key from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a>
+property with the raw private key data if using the
+<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the private key
+file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
+</p>
+<p>
+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.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
+ <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the private key file
+ (PEM, DER, or PKCS<span class="type">12</span> format). The path must be UTF-8 encoded; use
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed. Passing NULL with any <em class="parameter"><code>scheme</code></em>
+ clears the private key.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
+<td>password used to decrypt the private key
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
+<td>desired storage scheme for the private key
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
+<td>on successful return, the type of the private key added
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>on unsuccessful return, an error
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="nm_setting_802_1x_get_private_key_password ()">
+<a name="nm-setting-802-1x-get-private-key-password"></a><h3>nm_setting_802_1x_get_private_key_password ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_private_key_password
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the private key password used to decrypt the private key if
+ previously set with <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file" title="nm_setting_802_1x_set_private_key_from_file ()"><code class="function">nm_setting_802_1x_set_private_key_from_file()</code></a>,
+ <code class="function">nm_setting_802_1x_set_private_key_path()</code>, or the
+ <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a> property.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="nm_setting_802_1x_get_private_key_format ()">
+<a name="nm-setting-802-1x-get-private-key-format"></a><h3>nm_setting_802_1x_get_private_key_format ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a> nm_setting_802_1x_get_private_key_format
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the data format of the private key data stored in the
+ <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_scheme ()">
+<a name="nm-setting-802-1x-get-phase2-private-key-scheme"></a><h3>nm_setting_802_1x_get_phase2_private_key_scheme ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> nm_setting_802_1x_get_phase2_private_key_scheme
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
-Returns the scheme used to store the private key. If the returned scheme is
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use
+Returns the scheme used to store the "phase 2" private key. If the returned
+scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>; if
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use
+<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use
<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
</p>
<div class="variablelist"><table border="0">
@@ -1635,26 +1811,22 @@ Returns the scheme used to store the private key. If the returned scheme is
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>scheme used to store the private key (blob or path)</td>
+<td> scheme used to store the "phase 2" private key (blob or path)
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-private-key-blob"></a><h3>nm_setting_802_1x_get_private_key_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_private_key_blob
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_blob ()">
+<a name="nm-setting-802-1x-get-phase2-private-key-blob"></a><h3>nm_setting_802_1x_get_phase2_private_key_blob ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_phase2_private_key_blob
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
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.
</p>
-<p>
-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.
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -1665,15 +1837,16 @@ keys should always be encrypted with a private key password.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the private key data</td>
+<td> the "phase 2" private key data
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-private-key-path"></a><h3>nm_setting_802_1x_get_private_key_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_private_key_path
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_path ()">
+<a name="nm-setting-802-1x-get-phase2-private-key-path"></a><h3>nm_setting_802_1x_get_phase2_private_key_path ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase2_private_key_path
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<p>
Private keys are used to authenticate the connecting client to the network
@@ -1690,46 +1863,33 @@ authentication method.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>path to the private key file</td>
+<td> path to the "phase 2" private key file
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-set-private-key"></a><h3>nm_setting_802_1x_set_private_key ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_private_key (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+<div class="refsect2" title="nm_setting_802_1x_set_phase2_private_key ()">
+<a name="nm-setting-802-1x-set-phase2-private-key"></a><h3>nm_setting_802_1x_set_phase2_private_key ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_phase2_private_key
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
<em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
<em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
<p>
+Reads a "phase 2" private key from disk and sets the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property with the raw private key data if
+using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the
+private key file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
+</p>
+<p>
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.
</p>
-<p>
-This function reads a private key from disk and sets the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property with the private key file data if using
-the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the private
-key file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
-</p>
-<p>
-If <em class="parameter"><code>password</code></em> is given, this function attempts to decrypt the private key to
-verify that <em class="parameter"><code>password</code></em> is correct, and if it is, updates the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a> property with the given <em class="parameter"><code>password</code></em>. If
-the decryption is unsuccessful, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned, <em class="parameter"><code>error</code></em> is set, and no
-internal data is changed. If no <em class="parameter"><code>password</code></em> is given, the private key is
-assumed to be valid, no decryption is performed, and the password may be set
-at a later time.
-</p>
-<p>
-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.
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -1740,41 +1900,45 @@ key password to prevent unauthorized access to unencrypted private key data.
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the private key file
-(PEM, DER, or PKCS<span class="type">12</span> format). The path must be UTF-8 encoded; use
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed. Passing NULL with any <em class="parameter"><code>scheme</code></em>
-clears the private key.</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
+ <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the "phase2" private
+ key file (PEM, DER, or PKCS<span class="type">12</span> format). The path must be UTF-8 encoded;
+ use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed. Passing NULL with any
+ <em class="parameter"><code>scheme</code></em> clears the "phase2" private key.
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
-<td>password used to decrypt the private key, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the password
-is unknown. If the password is given but fails to decrypt the private key,
-an error is returned.</td>
+<td>password used to decrypt the private key
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the private key</td>
+<td>desired storage scheme for the private key
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the private key added</td>
+<td>on successful return, the type of the private key added
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error</td>
+<td>on unsuccessful return, an error
+</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
+<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-private-key-password"></a><h3>nm_setting_802_1x_get_private_key_password ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_private_key_password
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_password ()">
+<a name="nm-setting-802-1x-get-phase2-private-key-password"></a><h3>nm_setting_802_1x_get_phase2_private_key_password ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase2_private_key_password
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
@@ -1786,18 +1950,19 @@ an error is returned.</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the private key password used to decrypt the private key if
-previously set with <code class="function">nm_setting_802_1x_set_private_key_from_file()</code>,
-<code class="function">nm_setting_802_1x_set_private_key_path()</code>, or the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a> property.</td>
+<td> the private key password used to decrypt the private key if
+ previously set with <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file" title="nm_setting_802_1x_set_phase2_private_key_from_file ()"><code class="function">nm_setting_802_1x_set_phase2_private_key_from_file()</code></a>,
+ <code class="function">nm_setting_802_1x_set_phase2_private_key_path()</code>, or the
+ <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a> property.
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-private-key-password-flags"></a><h3>nm_setting_802_1x_get_private_key_password_flags ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a> nm_setting_802_1x_get_private_key_password_flags
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_format ()">
+<a name="nm-setting-802-1x-get-phase2-private-key-format"></a><h3>nm_setting_802_1x_get_phase2_private_key_format ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a> nm_setting_802_1x_get_phase2_private_key_format
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
@@ -1809,18 +1974,44 @@ previously set with <code class="function">nm_setting_802_1x_set_private_key_fro
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a>
+<td> the data format of the "phase 2" private key data stored in the
+ <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-private-key-format"></a><h3>nm_setting_802_1x_get_private_key_format ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a> nm_setting_802_1x_get_private_key_format
- (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="refsect2" title="enum NMSetting8021xCKType">
+<a name="NMSetting8021xCKType"></a><h3>enum NMSetting8021xCKType</h3>
+<pre class="programlisting">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;
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="nm_setting_802_1x_get_ca_cert ()">
+<a name="nm-setting-802-1x-get-ca-cert"></a><h3>nm_setting_802_1x_get_ca_cert ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_ca_cert (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_get_ca_cert</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>.</p>
+</div>
+<p>
+Returns the CA certificate blob if the CA certificate is stored using the
+<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> 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.
+</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -1831,23 +2022,31 @@ previously set with <code class="function">nm_setting_802_1x_set_private_key_fro
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the data format of the private key data stored in the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property</td>
+<td> the CA certificate data
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-phase2-private-key-scheme"></a><h3>nm_setting_802_1x_get_phase2_private_key_scheme ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a> nm_setting_802_1x_get_phase2_private_key_scheme
- (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="refsect2" title="nm_setting_802_1x_set_ca_cert_from_file ()">
+<a name="nm-setting-802-1x-set-ca-cert-from-file"></a><h3>nm_setting_802_1x_set_ca_cert_from_file ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_ca_cert_from_file
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_set_ca_cert_from_file</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert" title="nm_setting_802_1x_set_ca_cert ()"><code class="function">nm_setting_802_1x_set_ca_cert()</code></a> with the
+ <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
+</div>
<p>
-Returns the scheme used to store the "phase 2" private key. If the returned
-scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>; if
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
+Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-cert" title='The "ca-cert" property'><span class="type">"ca-cert"</span></a> property
+with the raw certificate data using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>
+scheme.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
@@ -1858,26 +2057,83 @@ scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-
</td>
</tr>
<tr>
+<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
+<td>the path of the CA certificate file (PEM or DER format). Passing
+ NULL clears the CA certificate.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
+<td>on successful return, the type of the certificate added
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>on unsuccessful return, an error
+</td>
+</tr>
+<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>scheme used to store the "phase 2" private key (blob or path)</td>
+<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-phase2-private-key-blob"></a><h3>nm_setting_802_1x_get_phase2_private_key_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_phase2_private_key_blob
- (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="refsect2" title="nm_setting_802_1x_get_client_cert ()">
+<a name="nm-setting-802-1x-get-client-cert"></a><h3>nm_setting_802_1x_get_client_cert ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_client_cert (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_get_client_cert</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>.</p>
+</div>
<p>
-Private keys are used to authenticate the connecting client to the network
+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.
</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the client certificate data
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="nm_setting_802_1x_set_client_cert_from_file ()">
+<a name="nm-setting-802-1x-set-client-cert-from-file"></a><h3>nm_setting_802_1x_set_client_cert_from_file ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_client_cert_from_file
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_set_client_cert_from_file</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert" title="nm_setting_802_1x_set_client_cert ()"><code class="function">nm_setting_802_1x_set_client_cert()</code></a> with the
+ <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
+</div>
+<p>
+Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--client-cert" title='The "client-cert" property'><span class="type">"client-cert"</span></a>
+property with the raw certificate data.
+</p>
<p>
-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.
+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.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
@@ -1888,19 +2144,127 @@ keys should always be encrypted with a private key password.
</td>
</tr>
<tr>
+<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
+<td>the path of the client certificate file (PEM, DER, or
+ PKCS<span class="type">12</span> format). Passing NULL clears the client certificate.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
+<td>on successful return, the type of the certificate added
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>on unsuccessful return, an error
+</td>
+</tr>
+<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the "phase 2" private key data</td>
+<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-phase2-private-key-path"></a><h3>nm_setting_802_1x_get_phase2_private_key_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase2_private_key_path
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_cert ()">
+<a name="nm-setting-802-1x-get-phase2-ca-cert"></a><h3>nm_setting_802_1x_get_phase2_ca_cert ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_phase2_ca_cert
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_get_phase2_ca_cert</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-blob" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_phase2_ca_cert_blob()</code></a>.</p>
+</div>
<p>
-Private keys are used to authenticate the connecting client to the network
+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.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the "phase 2" CA certificate data
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="nm_setting_802_1x_set_phase2_ca_cert_from_file ()">
+<a name="nm-setting-802-1x-set-phase2-ca-cert-from-file"></a><h3>nm_setting_802_1x_set_phase2_ca_cert_from_file ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_phase2_ca_cert_from_file
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_set_phase2_ca_cert_from_file</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert" title="nm_setting_802_1x_set_phase2_ca_cert ()"><code class="function">nm_setting_802_1x_set_phase2_ca_cert()</code></a>.
+ with the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
+</div>
+<p>
+Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-cert" title='The "phase2-ca-cert" property'><span class="type">"phase2-ca-cert"</span></a>
+property with the raw certificate data.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
+<td>the path of the "phase2" CA certificate file (PEM or DER format).
+ Passing NULL with any <em class="parameter"><code>scheme</code></em> clears the "phase2" CA certificate.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
+<td>on successful return, the type of the certificate added
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>on unsuccessful return, an error
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_client_cert ()">
+<a name="nm-setting-802-1x-get-phase2-client-cert"></a><h3>nm_setting_802_1x_get_phase2_client_cert ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_phase2_client_cert
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_get_phase2_client_cert</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-blob" title="nm_setting_802_1x_get_phase2_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_phase2_client_cert_blob()</code></a>.</p>
+</div>
+<p>
+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.
</p>
@@ -1914,46 +2278,123 @@ authentication method.
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>path to the "phase 2" private key file</td>
+<td> the "phase 2" client certificate data
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-set-phase2-private-key"></a><h3>nm_setting_802_1x_set_phase2_private_key ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_phase2_private_key
+<div class="refsect2" title="nm_setting_802_1x_set_phase2_client_cert_from_file ()">
+<a name="nm-setting-802-1x-set-phase2-client-cert-from-file"></a><h3>nm_setting_802_1x_set_phase2_client_cert_from_file ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_phase2_client_cert_from_file
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
- <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
- <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_set_phase2_client_cert_from_file</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert" title="nm_setting_802_1x_set_phase2_client_cert ()"><code class="function">nm_setting_802_1x_set_phase2_client_cert()</code></a> with the.
+ <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
+</div>
<p>
-Private keys are used to authenticate the connecting client to the network
+Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-client-cert" title='The "phase2-client-cert" property'><span class="type">"phase2-client-cert"</span></a>
+property with the raw certificate data.
+</p>
+<p>
+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.
</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
+<td>pass the path of the "phase2" client certificate file (PEM, DER,
+ or PKCS<span class="type">12</span> format). Passing NULL clears the "phase2" client certificate.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
+<td>on successful return, the type of the certificate added
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>on unsuccessful return, an error
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="nm_setting_802_1x_get_private_key ()">
+<a name="nm-setting-802-1x-get-private-key"></a><h3>nm_setting_802_1x_get_private_key ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_private_key (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_get_private_key</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob" title="nm_setting_802_1x_get_private_key_blob ()"><code class="function">nm_setting_802_1x_get_private_key_blob()</code></a>.</p>
+</div>
<p>
-This function reads a private key from disk and sets the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property with the private key file data if
-using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the
-private key file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> 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.
</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the private key data
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="nm_setting_802_1x_set_private_key_from_file ()">
+<a name="nm-setting-802-1x-set-private-key-from-file"></a><h3>nm_setting_802_1x_set_private_key_from_file ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_private_key_from_file
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_set_private_key_from_file</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a> with.
+ the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
+</div>
<p>
-If <em class="parameter"><code>password</code></em> is given, this function attempts to decrypt the private key to
-verify that <em class="parameter"><code>password</code></em> is correct, and if it is, updates the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a> property with the given
-<em class="parameter"><code>password</code></em>. If the decryption is unsuccessful, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned, <em class="parameter"><code>error</code></em> is
-set, and no internal data is changed. If no <em class="parameter"><code>password</code></em> is given, the private
-key is assumed to be valid, no decryption is performed, and the password may
-be set at a later time.
+Reads a private key from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a>
+property with the raw private key data.
</p>
<p>
-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.
+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.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
@@ -1964,43 +2405,45 @@ key password to prevent unauthorized access to unencrypted private key data.
</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the "phase2" private
-key file (PEM, DER, or PKCS<span class="type">12</span> format). The path must be UTF-8 encoded;
-use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed. Passing NULL with any
-<em class="parameter"><code>scheme</code></em> clears the private key.</td>
+<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
+<td>the path of the private key file (PEM, DER, or PKCS<span class="type">12</span> format).
+ Passing NULL clears the private key.
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
-<td>password used to decrypt the private key, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the password
-is unknown. If the password is given but fails to decrypt the private key,
-an error is returned.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the private key</td>
+<td>password used to decrypt the private key
+</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the private key added</td>
+<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
+<td>on successful return, the type of the private key added
+</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error</td>
+<td>on unsuccessful return, an error
+</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
+<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-phase2-private-key-password"></a><h3>nm_setting_802_1x_get_phase2_private_key_password ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_802_1x_get_phase2_private_key_password
+<div class="refsect2" title="nm_setting_802_1x_get_private_key_type ()">
+<a name="nm-setting-802-1x-get-private-key-type"></a><h3>nm_setting_802_1x_get_private_key_type ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="returnvalue">NMSetting8021xCKType</span></a> nm_setting_802_1x_get_private_key_type
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_get_private_key_type</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-format" title="nm_setting_802_1x_get_private_key_format ()"><code class="function">nm_setting_802_1x_get_private_key_format()</code></a>.</p>
+</div>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -2011,19 +2454,29 @@ an error is returned.</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the private key password used to decrypt the private key if
-previously set with <code class="function">nm_setting_802_1x_set_phase2_private_key_from_file()</code>,
-<code class="function">nm_setting_802_1x_set_phase2_private_key_path()</code>, or the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a> property.</td>
+<td> the data format of the private key data stored in the
+ <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property
+</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-phase2-private-key-password-flags"></a><h3>nm_setting_802_1x_get_phase2_private_key_password_flags ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a> nm_setting_802_1x_get_phase2_private_key_password_flags
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key ()">
+<a name="nm-setting-802-1x-get-phase2-private-key"></a><h3>nm_setting_802_1x_get_phase2_private_key ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_setting_802_1x_get_phase2_private_key
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_get_phase2_private_key</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob" title="nm_setting_802_1x_get_private_key_blob ()"><code class="function">nm_setting_802_1x_get_private_key_blob()</code></a>.</p>
+</div>
+<p>
+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.
+</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -2034,18 +2487,85 @@ previously set with <code class="function">nm_setting_802_1x_set_phase2_private_
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a>
+<td> the "phase 2" private key data
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2">
-<a name="nm-setting-802-1x-get-phase2-private-key-format"></a><h3>nm_setting_802_1x_get_phase2_private_key_format ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a> nm_setting_802_1x_get_phase2_private_key_format
+<div class="refsect2" title="nm_setting_802_1x_set_phase2_private_key_from_file ()">
+<a name="nm-setting-802-1x-set-phase2-private-key-from-file"></a><h3>nm_setting_802_1x_set_phase2_private_key_from_file ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_802_1x_set_phase2_private_key_from_file
+ (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
+ <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_set_phase2_private_key_from_file</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()"><code class="function">nm_setting_802_1x_set_phase2_private_key()</code></a> with
+ the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
+</div>
+<p>
+Reads a "phase 2" private key from disk and sets the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property with the raw private key data.
+</p>
+<p>
+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.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
+<td>the path of the "phase2" private key file (PEM, DER, or PKCS<span class="type">12</span>
+ format). Passing NULL clears the "phase2" private key.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
+<td>password used to decrypt the private key
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
+<td>on successful return, the type of the private key added
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>on unsuccessful return, an error
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_type ()">
+<a name="nm-setting-802-1x-get-phase2-private-key-type"></a><h3>nm_setting_802_1x_get_phase2_private_key_type ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="returnvalue">NMSetting8021xCKType</span></a> nm_setting_802_1x_get_phase2_private_key_type
(<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_setting_802_1x_get_phase2_private_key_type</code> 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 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format" title="nm_setting_802_1x_get_phase2_private_key_format ()"><code class="function">nm_setting_802_1x_get_phase2_private_key_format()</code></a>.</p>
+</div>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -2056,16 +2576,17 @@ previously set with <code class="function">nm_setting_802_1x_set_phase2_private_
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the data format of the "phase 2" private key data stored in the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property</td>
+<td> the data format of the private key data stored in the
+ <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property
+</td>
</tr>
</tbody>
</table></div>
</div>
</div>
-<div class="refsect1">
+<div class="refsect1" title="Property Details">
<a name="NMSetting8021x.property-details"></a><h2>Property Details</h2>
-<div class="refsect2">
+<div class="refsect2" title='The "anonymous-identity" property'>
<a name="NMSetting8021x--anonymous-identity"></a><h3>The <code class="literal">"anonymous-identity"</code> property</h3>
<pre class="programlisting"> "anonymous-identity" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
@@ -2076,7 +2597,7 @@ identity like EAP-TTLS.
<p>Default value: NULL</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "ca-cert" property'>
<a name="NMSetting8021x--ca-cert"></a><h3>The <code class="literal">"ca-cert"</code> property</h3>
<pre class="programlisting"> "ca-cert" <span class="type">GArray_guchar_</span>* : Read / Write</pre>
<p>
@@ -2086,7 +2607,7 @@ discouraged; use the <a class="link" href="NMSetting8021x.html#nm-setting-802-1x
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "ca-path" property'>
<a name="NMSetting8021x--ca-path"></a><h3>The <code class="literal">"ca-path"</code> property</h3>
<pre class="programlisting"> "ca-path" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
@@ -2097,7 +2618,7 @@ certificate specified in the <a class="link" href="NMSetting8021x.html#NMSetting
<p>Default value: NULL</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "client-cert" property'>
<a name="NMSetting8021x--client-cert"></a><h3>The <code class="literal">"client-cert"</code> property</h3>
<pre class="programlisting"> "client-cert" <span class="type">GArray_guchar_</span>* : Read / Write</pre>
<p>
@@ -2107,7 +2628,7 @@ discouraged; use the <a class="link" href="NMSetting8021x.html#nm-setting-802-1x
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "eap" property'>
<a name="NMSetting8021x--eap"></a><h3>The <code class="literal">"eap"</code> property</h3>
<pre class="programlisting"> "eap" <span class="type">GSList_gchararray_</span>* : Read / Write</pre>
<p>
@@ -2119,7 +2640,7 @@ allowed combinations.
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "identity" property'>
<a name="NMSetting8021x--identity"></a><h3>The <code class="literal">"identity"</code> property</h3>
<pre class="programlisting"> "identity" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
@@ -2129,7 +2650,7 @@ user or login name.
<p>Default value: NULL</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "password" property'>
<a name="NMSetting8021x--password"></a><h3>The <code class="literal">"password"</code> property</h3>
<pre class="programlisting"> "password" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
@@ -2138,17 +2659,7 @@ Password used for EAP authentication methods.
<p>Default value: NULL</p>
</div>
<hr>
-<div class="refsect2">
-<a name="NMSetting8021x--password-flags"></a><h3>The <code class="literal">"password-flags"</code> property</h3>
-<pre class="programlisting"> "password-flags" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write</pre>
-<p>
-Flags indicating how to handle <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'><span class="type">"password"</span></a>:.
-</p>
-<p>Allowed values: &lt;= 7</p>
-<p>Default value: 0</p>
-</div>
-<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "phase1-fast-provisioning" property'>
<a name="NMSetting8021x--phase1-fast-provisioning"></a><h3>The <code class="literal">"phase1-fast-provisioning"</code> property</h3>
<pre class="programlisting"> "phase1-fast-provisioning" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
@@ -2162,7 +2673,7 @@ wpa_supplicant documentation for more details.
<p>Default value: NULL</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "phase1-peaplabel" property'>
<a name="NMSetting8021x--phase1-peaplabel"></a><h3>The <code class="literal">"phase1-peaplabel"</code> property</h3>
<pre class="programlisting"> "phase1-peaplabel" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
@@ -2174,7 +2685,7 @@ wpa_supplicant documentation for more details.
<p>Default value: NULL</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "phase1-peapver" property'>
<a name="NMSetting8021x--phase1-peapver"></a><h3>The <code class="literal">"phase1-peapver"</code> property</h3>
<pre class="programlisting"> "phase1-peapver" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
@@ -2188,7 +2699,7 @@ version.
<p>Default value: NULL</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "phase2-auth" property'>
<a name="NMSetting8021x--phase2-auth"></a><h3>The <code class="literal">"phase2-auth"</code> property</h3>
<pre class="programlisting"> "phase2-auth" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
@@ -2202,7 +2713,7 @@ authentication; see the wpa_supplicant documentation for more details.
<p>Default value: NULL</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "phase2-autheap" property'>
<a name="NMSetting8021x--phase2-autheap"></a><h3>The <code class="literal">"phase2-autheap"</code> property</h3>
<pre class="programlisting"> "phase2-autheap" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
@@ -2216,7 +2727,7 @@ wpa_supplicant documentation for more details.
<p>Default value: NULL</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "phase2-ca-cert" property'>
<a name="NMSetting8021x--phase2-ca-cert"></a><h3>The <code class="literal">"phase2-ca-cert"</code> property</h3>
<pre class="programlisting"> "phase2-ca-cert" <span class="type">GArray_guchar_</span>* : Read / Write</pre>
<p>
@@ -2227,7 +2738,7 @@ Setting this property directly is discouraged; use the
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "phase2-ca-path" property'>
<a name="NMSetting8021x--phase2-ca-path"></a><h3>The <code class="literal">"phase2-ca-path"</code> property</h3>
<pre class="programlisting"> "phase2-ca-path" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
@@ -2238,7 +2749,7 @@ certificate specified in the <a class="link" href="NMSetting8021x.html#NMSetting
<p>Default value: NULL</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "phase2-client-cert" property'>
<a name="NMSetting8021x--phase2-client-cert"></a><h3>The <code class="literal">"phase2-client-cert"</code> property</h3>
<pre class="programlisting"> "phase2-client-cert" <span class="type">GArray_guchar_</span>* : Read / Write</pre>
<p>
@@ -2249,7 +2760,7 @@ properties. Setting this property directly is discouraged; use the
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "phase2-private-key" property'>
<a name="NMSetting8021x--phase2-private-key"></a><h3>The <code class="literal">"phase2-private-key"</code> property</h3>
<pre class="programlisting"> "phase2-private-key" <span class="type">GArray_guchar_</span>* : Read / Write</pre>
<p>
@@ -2263,7 +2774,7 @@ property directly is discouraged; use the
</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "phase2-private-key-password" property'>
<a name="NMSetting8021x--phase2-private-key-password"></a><h3>The <code class="literal">"phase2-private-key-password"</code> property</h3>
<pre class="programlisting"> "phase2-private-key-password" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
@@ -2277,17 +2788,7 @@ the private key by the <a class="link" href="NMSetting8021x.html#nm-setting-802-
<p>Default value: NULL</p>
</div>
<hr>
-<div class="refsect2">
-<a name="NMSetting8021x--phase2-private-key-password-flags"></a><h3>The <code class="literal">"phase2-private-key-password-flags"</code> property</h3>
-<pre class="programlisting"> "phase2-private-key-password-flags" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write</pre>
-<p>
-Flags indicating how to handle <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a>:.
-</p>
-<p>Allowed values: &lt;= 7</p>
-<p>Default value: 0</p>
-</div>
-<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "private-key" property'>
<a name="NMSetting8021x--private-key"></a><h3>The <code class="literal">"private-key"</code> property</h3>
<pre class="programlisting"> "private-key" <span class="type">GArray_guchar_</span>* : Read / Write</pre>
<p>
@@ -2295,16 +2796,9 @@ Contains the private key if the <a class="link" href="NMSetting8021x.html#NMSett
'tls'. Setting this property directly is discouraged; use the
<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a> function instead.
</p>
-<p>
-WARNING: <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> 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.
-</p>
</div>
<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "private-key-password" property'>
<a name="NMSetting8021x--private-key-password"></a><h3>The <code class="literal">"private-key-password"</code> property</h3>
<pre class="programlisting"> "private-key-password" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
@@ -2318,17 +2812,7 @@ the private key by the <a class="link" href="NMSetting8021x.html#nm-setting-802-
<p>Default value: NULL</p>
</div>
<hr>
-<div class="refsect2">
-<a name="NMSetting8021x--private-key-password-flags"></a><h3>The <code class="literal">"private-key-password-flags"</code> property</h3>
-<pre class="programlisting"> "private-key-password-flags" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write</pre>
-<p>
-Flags indicating how to handle <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a>:.
-</p>
-<p>Allowed values: &lt;= 7</p>
-<p>Default value: 0</p>
-</div>
-<hr>
-<div class="refsect2">
+<div class="refsect2" title='The "system-ca-certs" property'>
<a name="NMSetting8021x--system-ca-certs"></a><h3>The <code class="literal">"system-ca-certs"</code> property</h3>
<pre class="programlisting"> "system-ca-certs" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write / Construct</pre>
<p>
@@ -2346,6 +2830,6 @@ addition to any certificates specified by the <a class="link" href="NMSetting802
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.17</div>
+ Generated by GTK-Doc V1.15</div>
</body>
</html> \ No newline at end of file