RubyGems - glib2 - Versions diffs - 3.2.1-x86-mingw32 → 3.2.2-x86-mingw32 - Mend

glib2 3.2.1-x86-mingw32 → 3.2.2-x86-mingw32

Files changed (927) hide show

data/vendor/local/share/gtk-doc/html/p11-kit/p11-kit-Future.html CHANGED

@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Future: p11-kit</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="p11-kit">
 <link rel="up" href="reference.html" title="API Reference">
 <link rel="prev" href="p11-kit-Utilities.html" title="Utilities">
 <link rel="next" href="p11-kit-Deprecated.html" title="Deprecated">
-<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -33,7 +33,7 @@
 </tr></table></div>
 <div class="refsect1">
 <a name="p11-kit-Future.functions"></a><h2>Functions</h2>
-<div class="informaltable"><table width="100%" border="0">
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="functions_return">
 <col class="functions_name">
@@ -89,7 +89,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a>
+<span class="returnvalue">CK_RV</span>
 </td>
 <td class="function_name">
 <span class="c_punctuation">(</span><a class="link" href="p11-kit-Future.html#p11-kit-iter-callback" title="p11_kit_iter_callback ()">*p11_kit_iter_callback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
@@ -113,7 +113,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a>
+<span class="returnvalue">CK_RV</span>
 </td>
 <td class="function_name">
 <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()">p11_kit_iter_next</a> <span class="c_punctuation">()</span>
@@ -121,7 +121,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span></a>
+<span class="returnvalue">CK_FUNCTION_LIST_PTR</span>
 </td>
 <td class="function_name">
 <a class="link" href="p11-kit-Future.html#p11-kit-iter-get-module" title="p11_kit_iter_get_module ()">p11_kit_iter_get_module</a> <span class="c_punctuation">()</span>
@@ -129,7 +129,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-SLOT-ID:CAPS"><span class="returnvalue">CK_SLOT_ID</span></a>
+<span class="returnvalue">CK_SLOT_ID</span>
 </td>
 <td class="function_name">
 <a class="link" href="p11-kit-Future.html#p11-kit-iter-get-slot" title="p11_kit_iter_get_slot ()">p11_kit_iter_get_slot</a> <span class="c_punctuation">()</span>
@@ -137,6 +137,14 @@
 </tr>
 <tr>
 <td class="function_type">
+<span class="returnvalue">CK_SLOT_INFO</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-slot-info" title="p11_kit_iter_get_slot_info ()">p11_kit_iter_get_slot_info</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <span class="returnvalue">CK_TOKEN_INFO</span> *
 </td>
 <td class="function_name">
@@ -145,7 +153,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-SESSION-HANDLE:CAPS"><span class="returnvalue">CK_SESSION_HANDLE</span></a>
+<span class="returnvalue">CK_SESSION_HANDLE</span>
 </td>
 <td class="function_name">
 <a class="link" href="p11-kit-Future.html#p11-kit-iter-get-session" title="p11_kit_iter_get_session ()">p11_kit_iter_get_session</a> <span class="c_punctuation">()</span>
@@ -153,7 +161,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-SESSION-HANDLE:CAPS"><span class="returnvalue">CK_SESSION_HANDLE</span></a>
+<span class="returnvalue">CK_SESSION_HANDLE</span>
 </td>
 <td class="function_name">
 <a class="link" href="p11-kit-Future.html#p11-kit-iter-keep-session" title="p11_kit_iter_keep_session ()">p11_kit_iter_keep_session</a> <span class="c_punctuation">()</span>
@@ -161,7 +169,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-OBJECT-HANDLE:CAPS"><span class="returnvalue">CK_OBJECT_HANDLE</span></a>
+<span class="returnvalue">CK_OBJECT_HANDLE</span>
 </td>
 <td class="function_name">
 <a class="link" href="p11-kit-Future.html#p11-kit-iter-get-object" title="p11_kit_iter_get_object ()">p11_kit_iter_get_object</a> <span class="c_punctuation">()</span>
@@ -169,7 +177,15 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a>
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-attributes" title="p11_kit_iter_get_attributes ()">p11_kit_iter_get_attributes</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
 </td>
 <td class="function_name">
 <a class="link" href="p11-kit-Future.html#p11-kit-iter-load-attributes" title="p11_kit_iter_load_attributes ()">p11_kit_iter_load_attributes</a> <span class="c_punctuation">()</span>
@@ -177,7 +193,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a>
+<span class="returnvalue">CK_RV</span>
 </td>
 <td class="function_name">
 <a class="link" href="p11-kit-Future.html#p11-kit-iter-destroy-object" title="p11_kit_iter_destroy_object ()">p11_kit_iter_destroy_object</a> <span class="c_punctuation">()</span>
@@ -204,7 +220,7 @@
 </div>
 <div class="refsect1">
 <a name="p11-kit-Future.other"></a><h2>Types and Values</h2>
-<div class="informaltable"><table width="100%" border="0">
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="name">
 <col class="description">
@@ -227,7 +243,7 @@
 </div>
 <div class="refsect1">
 <a name="p11-kit-Future.description"></a><h2>Description</h2>
-<p>API that is not yet stable enough to be enabled by default. In all likelyhood
+<p>API that is not yet stable enough to be enabled by default. In all likelihood
 this will be included in the next release. To use this API you must define a
 MACRO. See the p11-kit.h header for more details.</p>
 </div>
@@ -242,8 +258,8 @@ and <code class="literal">disable-in</code> module configuration options.</p>
 <p>Normally this is automatically calculated from the program's argument list.
 You would usually call this before initializing p11-kit modules.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.2.6"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-set-progname.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">
@@ -264,8 +280,8 @@ You would usually call this before initializing p11-kit modules.</p>
 <span class="c_punctuation">(</span>*p11_kit_destroyer<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">void</span> *data</code></em>);</pre>
 <p>A callback called to free a resource.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.3.5"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-destroyer.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">
@@ -296,8 +312,8 @@ Relevant information in <em class="parameter"><code>uri</code></em>
  is specified then the iterator will iterate over all
 objects, unless otherwise filtered.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.4.6"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-new.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">
@@ -306,7 +322,7 @@ objects, unless otherwise filtered.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>uri</p></td>
-<td class="parameter_description"><p> a PKCS#11 URI to filter on, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
+<td class="parameter_description"><p> a PKCS#11 URI to filter on, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. </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>
 <tr>
@@ -318,7 +334,7 @@ objects, unless otherwise filtered.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.7.6.6.4.7"></a><h4>Returns</h4>
+<a name="p11-kit-iter-new.returns"></a><h4>Returns</h4>
 <p> a new iterator, which should be freed
 with <a class="link" href="p11-kit-Future.html#p11-kit-iter-free" title="p11_kit_iter_free ()"><code class="function">p11_kit_iter_free()</code></a>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
@@ -343,8 +359,8 @@ objects, unless otherwise filtered.</p>
 <p>This function should be called at most once, and should be
 called before iterating begins.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.5.7"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-set-uri.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">
@@ -358,7 +374,7 @@ called before iterating begins.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>uri</p></td>
-<td class="parameter_description"><p> a PKCS#11 URI to filter on, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
+<td class="parameter_description"><p> a PKCS#11 URI to filter on, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. </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>
@@ -383,8 +399,8 @@ as far as <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p1
 set to <code class="literal">CK_TRUE</code> and it's up to filters to change
 it to <code class="literal">CK_FALSE</code> when necessary.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.6.7"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-add-callback.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">
@@ -421,15 +437,15 @@ it to <code class="literal">CK_FALSE</code> when necessary.</p>
 <pre class="programlisting"><span class="returnvalue">void</span>
 p11_kit_iter_add_filter (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
                          <em class="parameter"><code><span class="type">CK_ATTRIBUTE</span> *matching</code></em>,
-                         <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> count</code></em>);</pre>
+                         <em class="parameter"><code><span class="type">CK_ULONG</span> count</code></em>);</pre>
 <p>Add a filter to limit the objects that the iterator iterates over.</p>
 <p>Only objects matching the passed in attributes will be iterated.
 This function can be called multiple times.</p>
 <p>The <em class="parameter"><code>matching</code></em>
  attributes are copied.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.7.7"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-add-filter.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">
@@ -458,9 +474,9 @@ This function can be called multiple times.</p>
 <hr>
 <div class="refsect2">
 <a name="p11-kit-iter-callback"></a><h3>p11_kit_iter_callback ()</h3>
-<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
 <span class="c_punctuation">(</span>*p11_kit_iter_callback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
-                          <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-BBOOL:CAPS"><span class="type">CK_BBOOL</span></a> *matches</code></em>,
+                          <em class="parameter"><code><span class="type">CK_BBOOL</span> *matches</code></em>,
                           <em class="parameter"><code><span class="type">void</span> *data</code></em>);</pre>
 <p>A callback setup with <a class="link" href="p11-kit-Future.html#p11-kit-iter-add-callback" title="p11_kit_iter_add_callback ()"><code class="function">p11_kit_iter_add_callback()</code></a>. This callback is
 called for each object iterated.</p>
@@ -470,8 +486,8 @@ skipped and not matched by <a class="link" href="p11-kit-Future.html#p11-kit-ite
 anything but CKR_OK, then the iteration is stopped, and
 <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> returns the result code.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.8.6"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-callback.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">
@@ -497,7 +513,7 @@ anything but CKR_OK, then the iteration is stopped, and
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.7.6.6.8.7"></a><h4>Returns</h4>
+<a name="p11-kit-iter-callback.returns"></a><h4>Returns</h4>
 <p> CKR_OK to continue iterating, CKR_CANCEL to stop, or
 anything else to fail</p>
 </div>
@@ -507,7 +523,7 @@ anything else to fail</p>
 <a name="p11-kit-iter-begin"></a><h3>p11_kit_iter_begin ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 p11_kit_iter_begin (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
-                    <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> *modules</code></em>);</pre>
+                    <em class="parameter"><code><span class="type">CK_FUNCTION_LIST_PTR</span> *modules</code></em>);</pre>
 <p>Begin iterating PKCS#11 objects in the given <em class="parameter"><code>modules</code></em>
 .</p>
 <p>The <em class="parameter"><code>modules</code></em>
@@ -517,8 +533,8 @@ pointers to the modules' PKCS#11 function pointers.</p>
 having sessions opened for each of them in turn, and searched
 for objects matching the search criteria.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.9.7"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-begin.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">
@@ -545,9 +561,9 @@ modules to iterate over. </p></td>
 <a name="p11-kit-iter-begin-with"></a><h3>p11_kit_iter_begin_with ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 p11_kit_iter_begin_with (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
-                         <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>,
-                         <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-SLOT-ID:CAPS"><span class="type">CK_SLOT_ID</span></a> slot</code></em>,
-                         <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-SESSION-HANDLE:CAPS"><span class="type">CK_SESSION_HANDLE</span></a> session</code></em>);</pre>
+                         <em class="parameter"><code><span class="type">CK_FUNCTION_LIST_PTR</span> module</code></em>,
+                         <em class="parameter"><code><span class="type">CK_SLOT_ID</span> slot</code></em>,
+                         <em class="parameter"><code><span class="type">CK_SESSION_HANDLE</span> session</code></em>);</pre>
 <p>Begin iterating PKCS#11 objects in the given <em class="parameter"><code>module</code></em>
 .</p>
 <p>If <em class="parameter"><code>slot</code></em>
@@ -558,8 +574,8 @@ slot.</p>
 objects visible through that session, which implies that they
 are also limited to the slot which the session was opened for.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.10.7"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-begin-with.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">
@@ -593,7 +609,7 @@ are also limited to the slot which the session was opened for.</p>
 <hr>
 <div class="refsect2">
 <a name="p11-kit-iter-next"></a><h3>p11_kit_iter_next ()</h3>
-<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
 p11_kit_iter_next (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
 <p>Iterate to the next matching object.</p>
 <p>To access the object, session and so on, use the <a class="link" href="p11-kit-Future.html#p11-kit-iter-get-object" title="p11_kit_iter_get_object ()"><code class="function">p11_kit_iter_get_object()</code></a>,
@@ -603,8 +619,8 @@ or <a class="link" href="p11-kit-Future.html#p11-kit-iter-begin-with" title="p11
 <p>Objects which are skipped by callbacks will not be returned here
 as matching objects.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.11.8"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-next.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">
@@ -618,20 +634,20 @@ as matching objects.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.7.6.6.11.9"></a><h4>Returns</h4>
+<a name="p11-kit-iter-next.returns"></a><h4>Returns</h4>
 <p> CKR_OK if an object matched, CKR_CANCEL if no more objects, or another error</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="p11-kit-iter-get-module"></a><h3>p11_kit_iter_get_module ()</h3>
-<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span></a>
+<pre class="programlisting"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span>
 p11_kit_iter_get_module (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
 <p>Get the module function pointers for the current matching object.</p>
 <p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.12.6"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-get-module.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">
@@ -645,20 +661,20 @@ p11_kit_iter_get_module (<em class="parameter"><code><a class="link" href="p11-k
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.7.6.6.12.7"></a><h4>Returns</h4>
+<a name="p11-kit-iter-get-module.returns"></a><h4>Returns</h4>
 <p> the module which the current matching object is in</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="p11-kit-iter-get-slot"></a><h3>p11_kit_iter_get_slot ()</h3>
-<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-SLOT-ID:CAPS"><span class="returnvalue">CK_SLOT_ID</span></a>
+<pre class="programlisting"><span class="returnvalue">CK_SLOT_ID</span>
 p11_kit_iter_get_slot (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
 <p>Get the slot which the current matching object is on.</p>
 <p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.13.6"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-get-slot.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">
@@ -672,20 +688,47 @@ p11_kit_iter_get_slot (<em class="parameter"><code><a class="link" href="p11-kit
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.7.6.6.13.7"></a><h4>Returns</h4>
+<a name="p11-kit-iter-get-slot.returns"></a><h4>Returns</h4>
 <p> the slot of the current matching object</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
+<a name="p11-kit-iter-get-slot-info"></a><h3>p11_kit_iter_get_slot_info ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_SLOT_INFO</span> *
+p11_kit_iter_get_slot_info (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
+<p>Get the slot info for the slot which the current matching object is on.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-get-slot-info.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>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-get-slot-info.returns"></a><h4>Returns</h4>
+<p> the slot of the current matching object.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="p11-kit-iter-get-token"></a><h3>p11_kit_iter_get_token ()</h3>
 <pre class="programlisting"><span class="returnvalue">CK_TOKEN_INFO</span> *
 p11_kit_iter_get_token (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
 <p>Get the token info for the token which the current matching object is on.</p>
-<p>This can only be called after p11_kit_iter_next(0 succeeds.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.14.6"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-get-token.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">
@@ -699,14 +742,14 @@ p11_kit_iter_get_token (<em class="parameter"><code><a class="link" href="p11-ki
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.7.6.6.14.7"></a><h4>Returns</h4>
+<a name="p11-kit-iter-get-token.returns"></a><h4>Returns</h4>
 <p> the slot of the current matching object.</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="p11-kit-iter-get-session"></a><h3>p11_kit_iter_get_session ()</h3>
-<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-SESSION-HANDLE:CAPS"><span class="returnvalue">CK_SESSION_HANDLE</span></a>
+<pre class="programlisting"><span class="returnvalue">CK_SESSION_HANDLE</span>
 p11_kit_iter_get_session (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
 <p>Get the session which the current matching object is acessible
 through.</p>
@@ -714,8 +757,8 @@ through.</p>
 <p>The session may be closed after the next <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> call
 unless <a class="link" href="p11-kit-Future.html#p11-kit-iter-keep-session" title="p11_kit_iter_keep_session ()"><code class="function">p11_kit_iter_keep_session()</code></a> is called.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.15.7"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-get-session.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">
@@ -729,14 +772,14 @@ unless <a class="link" href="p11-kit-Future.html#p11-kit-iter-keep-session" titl
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.7.6.6.15.8"></a><h4>Returns</h4>
+<a name="p11-kit-iter-get-session.returns"></a><h4>Returns</h4>
 <p> the session used to find the current matching object</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="p11-kit-iter-keep-session"></a><h3>p11_kit_iter_keep_session ()</h3>
-<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-SESSION-HANDLE:CAPS"><span class="returnvalue">CK_SESSION_HANDLE</span></a>
+<pre class="programlisting"><span class="returnvalue">CK_SESSION_HANDLE</span>
 p11_kit_iter_keep_session (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
 <p>After calling this function the session open for iterating
 the current object will not be automatically closed by
@@ -747,8 +790,8 @@ after the iterator has been freed. The session may still be
 used by the iterator if further iterations are performed.</p>
 <p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.16.7"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-keep-session.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">
@@ -762,20 +805,20 @@ used by the iterator if further iterations are performed.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.7.6.6.16.8"></a><h4>Returns</h4>
+<a name="p11-kit-iter-keep-session.returns"></a><h4>Returns</h4>
 <p> the current session</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="p11-kit-iter-get-object"></a><h3>p11_kit_iter_get_object ()</h3>
-<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-OBJECT-HANDLE:CAPS"><span class="returnvalue">CK_OBJECT_HANDLE</span></a>
+<pre class="programlisting"><span class="returnvalue">CK_OBJECT_HANDLE</span>
 p11_kit_iter_get_object (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
 <p>Get the current matching object.</p>
 <p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.17.6"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-get-object.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">
@@ -789,36 +832,83 @@ p11_kit_iter_get_object (<em class="parameter"><code><a class="link" href="p11-k
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.7.6.6.17.7"></a><h4>Returns</h4>
+<a name="p11-kit-iter-get-object.returns"></a><h4>Returns</h4>
 <p> the current matching object</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
+<a name="p11-kit-iter-get-attributes"></a><h3>p11_kit_iter_get_attributes ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_iter_get_attributes (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
+                             <em class="parameter"><code><span class="type">CK_ATTRIBUTE</span> *template</code></em>,
+                             <em class="parameter"><code><span class="type">CK_ULONG</span> count</code></em>);</pre>
+<p>Get attributes for the current matching object.</p>
+<p>This calls <code class="literal">C_GetAttributeValue</code> for the object
+currently iterated to. Return value and attribute memory behavior
+is identical to the PKCS#11 <code class="literal">C_GetAttributeValue</code>
+function.</p>
+<p>You might choose to use <a class="link" href="p11-kit-Future.html#p11-kit-iter-load-attributes" title="p11_kit_iter_load_attributes ()"><code class="function">p11_kit_iter_load_attributes()</code></a> for a more
+helpful variant.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-get-attributes.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>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p> the attributes to get. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=count][<acronym title="Parameter for input and for returning results. Default is transfer full."><span class="acronym">inout</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>count</p></td>
+<td class="parameter_description"><p>the number of attributes</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-get-attributes.returns"></a><h4>Returns</h4>
+<p> The result from <code class="literal">C_GetAttributeValue</code>.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="p11-kit-iter-load-attributes"></a><h3>p11_kit_iter_load_attributes ()</h3>
-<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
 p11_kit_iter_load_attributes (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
                               <em class="parameter"><code><span class="type">CK_ATTRIBUTE</span> *template</code></em>,
-                              <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> count</code></em>);</pre>
+                              <em class="parameter"><code><span class="type">CK_ULONG</span> count</code></em>);</pre>
 <p>Retrieve attributes for the current matching object.</p>
 <p>Each attribute in the array will be filled in with the value
 of that attribute retrieved from the object. After use the
 attribute value memory pointed to by the <code class="literal">pValue</code>
 of each attribute should be freed with the <code class="literal">free()</code>
 function.</p>
-<p>If the <code class="literal">pValue</code> of an attribute is not <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> passed
+<p>If the <code class="literal">pValue</code> of an attribute is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> passed
 to this function, then it will be passed to
 <code class="literal">realloc()</code> to allocate the correct amount
 of space for the attribute value.</p>
 <p>If any attribute is not present on the object, or is sensitive and
 cannot be retrieved, then the <code class="literal">pValue</code> will be NULL.
-If <code class="literal">pValue</code> was not <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> when passed to this function
+If <code class="literal">pValue</code> was not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> when passed to this function
 then it will be freed with <code class="literal">free()</code>. In these
 cases <code class="literal">CKR_OK</code> is returned.</p>
 <p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.18.9"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-load-attributes.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">
@@ -844,20 +934,20 @@ cases <code class="literal">CKR_OK</code> is returned.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.7.6.6.18.10"></a><h4>Returns</h4>
+<a name="p11-kit-iter-load-attributes.returns"></a><h4>Returns</h4>
 <p> CKR_OK or a failure code</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="p11-kit-iter-destroy-object"></a><h3>p11_kit_iter_destroy_object ()</h3>
-<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
 p11_kit_iter_destroy_object (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
-<p>Destory the current matching object.</p>
+<p>Destroy the current matching object.</p>
 <p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.19.6"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-destroy-object.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">
@@ -865,13 +955,13 @@ p11_kit_iter_destroy_object (<em class="parameter"><code><a class="link" href="p
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>iter</p></td>
-<td class="parameter_description"><p>teh iterator</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.7.6.6.19.7"></a><h4>Returns</h4>
+<a name="p11-kit-iter-destroy-object.returns"></a><h4>Returns</h4>
 <p> CKR_OK or a failure code</p>
 </div>
 </div>
@@ -883,8 +973,8 @@ p11_kit_iter_free (<em class="parameter"><code><a class="link" href="p11-kit-Fut
 <p>Frees the iterator and all resources, such as sessions
 or callbacks held by the iterator.</p>
 <div class="refsect3">
-<a name="id-1.7.6.6.20.5"></a><h4>Parameters</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="p11-kit-iter-free.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">
@@ -924,10 +1014,10 @@ p11_kit_remote_serve_module (<em class="parameter"><code><span class="type">CK_F
 <hr>
 <div class="refsect2">
 <a name="P11KitIterBehavior"></a><h3>enum P11KitIterBehavior</h3>
-<p>Various flags controling the behavior of the iterator.</p>
+<p>Various flags controlling the behavior of the iterator.</p>
 <div class="refsect3">
-<a name="id-1.7.6.7.4.4"></a><h4>Members</h4>
-<div class="informaltable"><table width="100%" border="0">
+<a name="P11KitIterBehavior.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
 <col class="enum_members_description">
@@ -957,6 +1047,6 @@ p11_kit_remote_serve_module (<em class="parameter"><code><span class="type">CK_F
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.24</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>