New upstream version 1.16.0 upstream/1.16.0

1 files changed, 60 insertions, 7 deletions

diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 70a83944..3528aac9 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -631,6 +631,14 @@
 <a class="link" href="libnm-nm-utils.html#nm-utils-get-timestamp-msec" title="nm_utils_get_timestamp_msec ()">nm_utils_get_timestamp_msec</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-utils.html#nm-utils-base64secret-decode" title="nm_utils_base64secret_decode ()">nm_utils_base64secret_decode</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -895,7 +903,7 @@ use <a class="link" href="libnm-nm-utils.html#nm-utils-ap-mode-security-valid" t
 <tbody>
 <tr>
 <td class="parameter_name"><p>type</p></td>
-<td class="parameter_description"><p>the security type to check AP flags and device capabilties against,
+<td class="parameter_description"><p>the security type to check AP flags and device capabilities against,
 e.g. <a class="link" href="libnm-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS"><span class="type">NMU_SEC_STATIC_WEP</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -925,13 +933,13 @@ arguments are valid</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>ap_wpa</p></td>
-<td class="parameter_description"><p>bitfield of AP capabilties derived from the AP's WPA beacon,
+<td class="parameter_description"><p>bitfield of AP capabilities derived from the AP's WPA beacon,
 e.g. (<a class="link" href="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-TKIP:CAPS"><span class="type">NM_802_11_AP_SEC_PAIR_TKIP</span></a> | <a class="link" href="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-KEY-MGMT-PSK:CAPS"><span class="type">NM_802_11_AP_SEC_KEY_MGMT_PSK</span></a>)</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>ap_rsn</p></td>
-<td class="parameter_description"><p>bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
+<td class="parameter_description"><p>bitfield of AP capabilities derived from the AP's RSN/WPA2 beacon,
 e.g. (<a class="link" href="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-CCMP:CAPS"><span class="type">NM_802_11_AP_SEC_PAIR_CCMP</span></a> | <a class="link" href="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-TKIP:CAPS"><span class="type">NM_802_11_AP_SEC_PAIR_TKIP</span></a>)</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -940,7 +948,7 @@ e.g. (<a class="link" href="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-C
 </div>
 <div class="refsect3">
 <a name="nm-utils-security-valid.returns"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the device capabilities and AP capabilties intersect and are
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the device capabilities and AP capabilities intersect and are
 compatible with the desired <em class="parameter"><code>type</code></em>
 , <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they are not</p>
 </div>
@@ -965,7 +973,7 @@ desired security type are valid for AP/Hotspot connections.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>type</p></td>
-<td class="parameter_description"><p>the security type to check device capabilties against,
+<td class="parameter_description"><p>the security type to check device capabilities against,
 e.g. <a class="link" href="libnm-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS"><span class="type">NMU_SEC_STATIC_WEP</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -1888,9 +1896,9 @@ and <em class="parameter"><code>predicate</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>user_data</p></td>
-<td class="parameter_description"><p>(allow-none): user data for <em class="parameter"><code>predicate</code></em>
+<td class="parameter_description"><p>user data for <em class="parameter"><code>predicate</code></em>
 function. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
@@ -3356,6 +3364,51 @@ nm_utils_sriov_vf_from_str (<em class="parameter"><code>const <span class="type"
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
 nm_utils_get_timestamp_msec (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-utils-base64secret-decode"></a><h3>nm_utils_base64secret_decode ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_utils_base64secret_decode (<em class="parameter"><code>const <span class="type">char</span> *base64_key</code></em>,
+                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> required_key_len</code></em>,
+                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *out_key</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-utils-base64secret-decode.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>base64_key</p></td>
+<td class="parameter_description"><p>the (possibly invalid) base64 encode key.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>required_key_len</p></td>
+<td class="parameter_description"><p>the expected (binary) length of the key after
+decoding. If the length does not match, the validation fails.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>out_key</p></td>
+<td class="parameter_description"><p>(out): an optional output buffer for the binary
+key. If given, it will be filled with exactly <em class="parameter"><code>required_key_len</code></em>
+bytes. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-utils-base64secret-decode.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the input key is a valid base64 encoded key
+with <em class="parameter"><code>required_key_len</code></em>
+bytes.</p>
+</div>
+<p class="since">Since: 1.16</p>
+</div>
 </div>
 <div class="refsect1">
 <a name="libnm-nm-utils.other_details"></a><h2>Types and Values</h2>