gnome-keyring r1433 - in trunk: . daemon/pkcs11 gp11 gp11/reference gp11/reference/tmpl pkcs11/gck/tests pkcs11/rpc-layer pkcs11/ssh-agent po
- From: nnielsen svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-keyring r1433 - in trunk: . daemon/pkcs11 gp11 gp11/reference gp11/reference/tmpl pkcs11/gck/tests pkcs11/rpc-layer pkcs11/ssh-agent po
- Date: Mon, 5 Jan 2009 05:05:44 +0000 (UTC)
Author: nnielsen
Date: Mon Jan 5 05:05:44 2009
New Revision: 1433
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1433&view=rev
Log:
* configure.in:
* NEWS:
* daemon/Makefile.am:
* pkcs11/gck/tests/Makefile.am:
* pkcs11/rpc-layer/Makefile.am:
* pkcs11/ssh-agent/gck-ssh-agent-standalone.c: Release 2.25.4
Added:
trunk/po/POTFILES.skip
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.in
trunk/daemon/pkcs11/Makefile.am
trunk/gp11/gp11-module.c
trunk/gp11/reference/gp11-undeclared.txt
trunk/gp11/reference/tmpl/gp11-unused.sgml
trunk/gp11/reference/tmpl/gp11.sgml
trunk/pkcs11/gck/tests/Makefile.am
trunk/pkcs11/rpc-layer/Makefile.am
trunk/pkcs11/ssh-agent/gck-ssh-agent-standalone.c
trunk/po/ChangeLog
trunk/po/POTFILES.in
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Mon Jan 5 05:05:44 2009
@@ -1,3 +1,16 @@
+Changes in version 2.25.4 are:
+* Half way through refactoring of PKCS#11 support.
+* Add crypto support to gp11 library.
+* gp11 library is now by and large thread-safe.
+* Add modular ssh-store, roots and rpc-layer PKCS#11 components.
+* Beginnings of a PKCS#11 based ssh-agent.
+* Transactional storage of PKCS#11 objects.
+* Add auto-authenticate support in GP11 library, which greatlty
+ simplifies figuring out when to provide passwords.
+* Fix initialization problems which prevented SSH agent from setting
+ environment variables properly [Yanko Kaneti]
+* Translation fixes [Gabor Kelemen]
+
Changes in version 2.25.2 are:
* Fix PKCS#11 corner cases highlighted by p11-tests tool.
* Solaris fixes [Halton Huo, Jeff Cai]
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Mon Jan 5 05:05:44 2009
@@ -1,6 +1,6 @@
AC_INIT(library/gnome-keyring.h)
-AM_INIT_AUTOMAKE(gnome-keyring, 2.25.3)
+AM_INIT_AUTOMAKE(gnome-keyring, 2.25.4)
AM_CONFIG_HEADER(config.h)
dnl ****************************************************************************
Modified: trunk/daemon/pkcs11/Makefile.am
==============================================================================
--- trunk/daemon/pkcs11/Makefile.am (original)
+++ trunk/daemon/pkcs11/Makefile.am Mon Jan 5 05:05:44 2009
@@ -8,7 +8,7 @@
$(GLIB_CFLAGS)
DAEMON_SRCS = \
- gkr-pkcs11-dispatch.c gkr-pkcs11-daemon.h \
+ gkr-pkcs11-dispatch.c gkr-pkcs11-dispatch.h \
gkr-pkcs11-dispatch-session.c \
gkr-pkcs11-dsa.c gkr-pkcs11-dsa.h \
$(top_srcdir)/pkcs11/gkr-pkcs11-message.c \
Modified: trunk/gp11/gp11-module.c
==============================================================================
--- trunk/gp11/gp11-module.c (original)
+++ trunk/gp11/gp11-module.c Mon Jan 5 05:05:44 2009
@@ -1019,32 +1019,35 @@
gboolean
gp11_module_enumerate_objects_full (GP11Module *self, GP11Attributes *attrs,
GCancellable *cancellable, GP11ObjectForeachFunc func,
- gpointer user_data, GError **error)
+ gpointer user_data, GError **err)
{
gboolean stop = FALSE;
gboolean ret = TRUE;
GList *objects, *o;
GList *slots, *l;
+ GError *error = NULL;
GP11Session *session;
- g_return_if_fail (GP11_IS_MODULE (self));
- g_return_if_fail (attrs);
- g_return_if_fail (func);
+ g_return_val_if_fail (GP11_IS_MODULE (self), FALSE);
+ g_return_val_if_fail (attrs, FALSE);
+ g_return_val_if_fail (func, FALSE);
gp11_attributes_ref (attrs);
slots = gp11_module_get_slots (self, TRUE);
for (l = slots; ret && !stop && l; l = g_list_next (l)) {
- session = gp11_slot_open_session (l->data, CKF_SERIAL_SESSION, error);
+ session = gp11_slot_open_session (l->data, CKF_SERIAL_SESSION, err);
if (!session) {
ret = FALSE;
continue;
}
- objects = gp11_session_find_objects_full (session, attrs, cancellable, error);
- if (*error) {
+ objects = gp11_session_find_objects_full (session, attrs, cancellable, &error);
+ if (error) {
ret = FALSE;
g_object_unref (session);
+ g_propagate_error (err, error);
+ error = NULL;
continue;
}
Modified: trunk/gp11/reference/gp11-undeclared.txt
==============================================================================
--- trunk/gp11/reference/gp11-undeclared.txt (original)
+++ trunk/gp11/reference/gp11-undeclared.txt Mon Jan 5 05:05:44 2009
@@ -555,6 +555,16 @@
firmware_version
free_private_memory
free_public_memory
+gp11_attributes_is_immutable
+gp11_attributes_set_immutable
+gp11_object_get_one
+gp11_object_get_one_async
+gp11_object_get_one_finish
+gp11_object_get_one_full
+gp11_slot_get_auto_login
+gp11_slot_get_reuse_sessions
+gp11_slot_set_auto_login
+gp11_slot_set_reuse_sessions
hardware_version
library_description
library_version
Modified: trunk/gp11/reference/tmpl/gp11-unused.sgml
==============================================================================
--- trunk/gp11/reference/tmpl/gp11-unused.sgml (original)
+++ trunk/gp11/reference/tmpl/gp11-unused.sgml Mon Jan 5 05:05:44 2009
@@ -3118,6 +3118,33 @@
@call_data:
@Returns:
+<!-- ##### ARG GP11Module:module-path ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL GP11Slot::authenticate-token ##### -->
+<para>
+
+</para>
+
+ gp11slot: the object which received the signal.
+ arg1:
+ Returns:
+
+<!-- ##### ARG GP11Slot:auto-login ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GP11Slot:reuse-sessions ##### -->
+<para>
+
+</para>
+
+
<!-- ##### MACRO GP11_ARGUMENTS_INIT ##### -->
<para>
@@ -3358,6 +3385,95 @@
</para>
+<!-- ##### FUNCTION gp11_attributes_is_immutable ##### -->
+<para>
+
+</para>
+
+ attrs:
+ Returns:
+
+<!-- ##### FUNCTION gp11_attributes_set_immutable ##### -->
+<para>
+
+</para>
+
+ attrs:
+
+<!-- ##### FUNCTION gp11_object_get_one ##### -->
+<para>
+
+</para>
+
+ object:
+ attr_type:
+ err:
+ Returns:
+
+<!-- ##### FUNCTION gp11_object_get_one_async ##### -->
+<para>
+
+</para>
+
+ object:
+ attr_type:
+ cancellable:
+ callback:
+ user_data:
+
+<!-- ##### FUNCTION gp11_object_get_one_finish ##### -->
+<para>
+
+</para>
+
+ object:
+ result:
+ err:
+ Returns:
+
+<!-- ##### FUNCTION gp11_object_get_one_full ##### -->
+<para>
+
+</para>
+
+ object:
+ attr_type:
+ cancellable:
+ err:
+ Returns:
+
+<!-- ##### FUNCTION gp11_slot_get_auto_login ##### -->
+<para>
+
+</para>
+
+ slot:
+ Returns:
+
+<!-- ##### FUNCTION gp11_slot_get_reuse_sessions ##### -->
+<para>
+
+</para>
+
+ slot:
+ Returns:
+
+<!-- ##### FUNCTION gp11_slot_set_auto_login ##### -->
+<para>
+
+</para>
+
+ slot:
+ auto_login:
+
+<!-- ##### FUNCTION gp11_slot_set_reuse_sessions ##### -->
+<para>
+
+</para>
+
+ slot:
+ reuse:
+
<!-- ##### MACRO hardware_version ##### -->
<para>
Modified: trunk/gp11/reference/tmpl/gp11.sgml
==============================================================================
--- trunk/gp11/reference/tmpl/gp11.sgml (original)
+++ trunk/gp11/reference/tmpl/gp11.sgml Mon Jan 5 05:05:44 2009
@@ -341,27 +341,11 @@
</para>
+ allocator:
@va:
@Returns:
-<!-- ##### FUNCTION gp11_attributes_set_immutable ##### -->
-<para>
-
-</para>
-
- attrs:
-
-
-<!-- ##### FUNCTION gp11_attributes_is_immutable ##### -->
-<para>
-
-</para>
-
- attrs:
- Returns:
-
-
<!-- ##### FUNCTION gp11_attributes_at ##### -->
<para>
@@ -548,7 +532,44 @@
</para>
-<!-- ##### ARG GP11Module:module-path ##### -->
+<!-- ##### SIGNAL GP11Module::authenticate-object ##### -->
+<para>
+
+</para>
+
+ gp11module: the object which received the signal.
+ arg1:
+ arg2:
+ arg3:
+ Returns:
+
+<!-- ##### SIGNAL GP11Module::authenticate-slot ##### -->
+<para>
+
+</para>
+
+ gp11module: the object which received the signal.
+ arg1:
+ arg2:
+ arg3:
+ Returns:
+
+<!-- ##### ARG GP11Module:auto-authenticate ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GP11Module:functions ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GP11Module:path ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GP11Module:pool-sessions ##### -->
<para>
</para>
@@ -569,7 +590,7 @@
</para>
- module:
+ self:
@Returns:
@@ -578,7 +599,7 @@
</para>
- module:
+ self:
@token_present:
@Returns:
@@ -739,20 +760,6 @@
</para>
-<!-- ##### SIGNAL GP11Slot::authenticate-token ##### -->
-<para>
-
-</para>
-
- gp11slot: the object which received the signal.
- arg1:
- Returns:
-
-<!-- ##### ARG GP11Slot:auto-login ##### -->
-<para>
-
-</para>
-
<!-- ##### ARG GP11Slot:handle ##### -->
<para>
@@ -763,11 +770,6 @@
</para>
-<!-- ##### ARG GP11Slot:reuse-sessions ##### -->
-<para>
-
-</para>
-
<!-- ##### FUNCTION gp11_slot_get_type ##### -->
<para>
@@ -781,52 +783,16 @@
</para>
- slot:
+ self:
@Returns:
-<!-- ##### FUNCTION gp11_slot_get_reuse_sessions ##### -->
-<para>
-
-</para>
-
- slot:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_slot_set_reuse_sessions ##### -->
-<para>
-
-</para>
-
- slot:
- reuse:
-
-
-<!-- ##### FUNCTION gp11_slot_get_auto_login ##### -->
-<para>
-
-</para>
-
- slot:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_slot_set_auto_login ##### -->
-<para>
-
-</para>
-
- slot:
- auto_login:
-
-
<!-- ##### FUNCTION gp11_slot_get_max_pin_length ##### -->
<para>
</para>
- slot:
+ self:
@Returns:
@@ -835,7 +801,7 @@
</para>
- slot:
+ self:
@Returns:
@@ -844,7 +810,7 @@
</para>
- slot:
+ self:
@Returns:
@@ -853,7 +819,7 @@
</para>
- slot:
+ self:
@Returns:
@@ -862,7 +828,7 @@
</para>
- slot:
+ self:
@mech_type:
@Returns:
@@ -872,7 +838,7 @@
</para>
- slot:
+ self:
@pin:
@length:
@label:
@@ -885,7 +851,7 @@
</para>
- slot:
+ self:
@pin:
@length:
@label:
@@ -898,7 +864,7 @@
</para>
- slot:
+ self:
@result:
@err:
@Returns:
@@ -909,7 +875,7 @@
</para>
- slot:
+ self:
@flags:
@err:
@Returns:
@@ -920,7 +886,7 @@
</para>
- slot:
+ self:
@flags:
@cancellable:
@err:
@@ -932,7 +898,7 @@
</para>
- slot:
+ self:
@flags:
@cancellable:
@callback:
@@ -944,7 +910,7 @@
</para>
- slot:
+ self:
@result:
@err:
@Returns:
@@ -1027,6 +993,8 @@
</para>
@gp11session: the object which received the signal.
+ Param2:
+ Returns:
<!-- ##### ARG GP11Session:handle ##### -->
<para>
@@ -1066,7 +1034,7 @@
</para>
- session:
+ self:
@Returns:
@@ -1075,7 +1043,7 @@
</para>
- session:
+ self:
@Returns:
@@ -1084,7 +1052,7 @@
</para>
- session:
+ self:
@pin:
@n_pin:
@err:
@@ -1096,7 +1064,7 @@
</para>
- session:
+ self:
@pin:
@n_pin:
@callback:
@@ -1108,7 +1076,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1119,7 +1087,7 @@
</para>
- session:
+ self:
@old_pin:
@n_old_pin:
@new_pin:
@@ -1133,7 +1101,7 @@
</para>
- session:
+ self:
@old_pin:
@n_old_pin:
@new_pin:
@@ -1147,7 +1115,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1158,7 +1126,7 @@
</para>
- session:
+ self:
@n_result:
@err:
@Returns:
@@ -1169,7 +1137,7 @@
</para>
- session:
+ self:
@n_result:
@callback:
@user_data:
@@ -1180,7 +1148,7 @@
</para>
- session:
+ self:
@result:
@n_result:
@err:
@@ -1192,7 +1160,7 @@
</para>
- session:
+ self:
@state:
@n_state:
@err:
@@ -1204,7 +1172,7 @@
</para>
- session:
+ self:
@state:
@n_state:
@callback:
@@ -1216,7 +1184,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1227,7 +1195,7 @@
</para>
- session:
+ self:
@user_type:
@pin:
@n_pin:
@@ -1240,7 +1208,7 @@
</para>
- session:
+ self:
@user_type:
@pin:
@n_pin:
@@ -1254,7 +1222,7 @@
</para>
- session:
+ self:
@user_type:
@pin:
@n_pin:
@@ -1268,7 +1236,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1279,7 +1247,7 @@
</para>
- session:
+ self:
@err:
@Returns:
@@ -1289,7 +1257,7 @@
</para>
- session:
+ self:
@cancellable:
@err:
@Returns:
@@ -1300,7 +1268,7 @@
</para>
- session:
+ self:
@cancellable:
@callback:
@user_data:
@@ -1311,7 +1279,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1322,7 +1290,7 @@
</para>
- session:
+ self:
@err:
@Varargs:
@Returns:
@@ -1333,7 +1301,7 @@
</para>
- session:
+ self:
@attrs:
@cancellable:
@err:
@@ -1345,7 +1313,7 @@
</para>
- session:
+ self:
@attrs:
@cancellable:
@callback:
@@ -1357,7 +1325,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1368,7 +1336,7 @@
</para>
- session:
+ self:
@err:
@Varargs:
@Returns:
@@ -1379,7 +1347,7 @@
</para>
- session:
+ self:
@attrs:
@cancellable:
@err:
@@ -1391,7 +1359,7 @@
</para>
- session:
+ self:
@attrs:
@cancellable:
@callback:
@@ -1403,7 +1371,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1414,7 +1382,7 @@
</para>
- session:
+ self:
@mechanism:
@err:
@Varargs:
@@ -1426,7 +1394,7 @@
</para>
- session:
+ self:
@mechanism:
@callback:
@user_data:
@@ -1438,7 +1406,7 @@
</para>
- session:
+ self:
@result:
@err:
@Varargs:
@@ -1450,7 +1418,7 @@
</para>
- session:
+ self:
@mechanism:
@public_key:
@private_key:
@@ -1464,7 +1432,7 @@
</para>
- session:
+ self:
@mechanism:
@callback:
@user_data:
@@ -1476,7 +1444,7 @@
</para>
- session:
+ self:
@result:
@public_key:
@private_key:
@@ -1490,7 +1458,7 @@
</para>
- session:
+ self:
@seed:
@n_seed:
@err:
@@ -1502,7 +1470,7 @@
</para>
- session:
+ self:
@seed:
@n_seed:
@callback:
@@ -1514,7 +1482,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1525,7 +1493,7 @@
</para>
- session:
+ self:
@n_random:
@err:
@Returns:
@@ -1536,7 +1504,7 @@
</para>
- session:
+ self:
@n_random:
@callback:
@user_data:
@@ -1547,7 +1515,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1558,7 +1526,7 @@
</para>
- session:
+ self:
@key:
@mech:
@input:
@@ -1573,7 +1541,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -1589,7 +1557,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -1604,7 +1572,7 @@
</para>
- session:
+ self:
@result:
@n_result:
@err:
@@ -1616,7 +1584,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@cancellable:
@@ -1629,7 +1597,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@cancellable:
@@ -1642,7 +1610,7 @@
</para>
- session:
+ self:
@key:
@result:
@err:
@@ -1654,7 +1622,7 @@
</para>
- session:
+ self:
@key:
@mech_type:
@input:
@@ -1669,7 +1637,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -1685,7 +1653,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -1700,7 +1668,7 @@
</para>
- session:
+ self:
@result:
@n_result:
@err:
@@ -1712,7 +1680,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@cancellable:
@@ -1725,7 +1693,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@cancellable:
@@ -1738,7 +1706,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1749,7 +1717,7 @@
</para>
- session:
+ self:
@mech_type:
@input:
@n_input:
@@ -1763,7 +1731,7 @@
</para>
- session:
+ self:
@mech_args:
@input:
@n_input:
@@ -1778,7 +1746,7 @@
</para>
- session:
+ self:
@mech_args:
@input:
@n_input:
@@ -1792,7 +1760,7 @@
</para>
- session:
+ self:
@result:
@n_result:
@err:
@@ -1804,7 +1772,7 @@
</para>
- session:
+ self:
@mech_args:
@cancellable:
@err:
@@ -1816,7 +1784,7 @@
</para>
- session:
+ self:
@mech_args:
@cancellable:
@callback:
@@ -1828,7 +1796,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1839,7 +1807,7 @@
</para>
- session:
+ self:
@key:
@digest_mech:
@encrypt_mech:
@@ -1853,7 +1821,7 @@
</para>
- session:
+ self:
@key:
@digest_mech:
@encrypt_mech:
@@ -1867,7 +1835,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1878,7 +1846,7 @@
</para>
- session:
+ self:
@key:
@digest_mech:
@decrypt_mech:
@@ -1892,7 +1860,7 @@
</para>
- session:
+ self:
@key:
@digest_mech:
@decrypt_mech:
@@ -1906,7 +1874,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1917,7 +1885,7 @@
</para>
- session:
+ self:
@key:
@decrypt_mech:
@verify_mech:
@@ -1931,7 +1899,7 @@
</para>
- session:
+ self:
@key:
@decrypt_mech:
@verify_mech:
@@ -1945,7 +1913,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -1956,7 +1924,7 @@
</para>
- session:
+ self:
@key:
@mech_type:
@input:
@@ -1971,7 +1939,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -1987,7 +1955,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -2002,7 +1970,7 @@
</para>
- session:
+ self:
@result:
@n_result:
@err:
@@ -2014,7 +1982,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@cancellable:
@@ -2027,7 +1995,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@cancellable:
@@ -2040,7 +2008,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -2051,7 +2019,7 @@
</para>
- session:
+ self:
@key:
@sign_mech:
@encrypt_mech:
@@ -2065,7 +2033,7 @@
</para>
- session:
+ self:
@key:
@sign_mechanism:
@encrypt_mech:
@@ -2079,7 +2047,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -2090,7 +2058,7 @@
</para>
- session:
+ self:
@key:
@mech_type:
@input:
@@ -2105,7 +2073,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -2121,7 +2089,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -2136,7 +2104,7 @@
</para>
- session:
+ self:
@result:
@n_result:
@err:
@@ -2148,7 +2116,7 @@
</para>
- session:
+ self:
@key:
@mech_type:
@input:
@@ -2164,7 +2132,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -2181,7 +2149,7 @@
</para>
- session:
+ self:
@key:
@mechanism:
@input:
@@ -2198,7 +2166,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -2209,7 +2177,7 @@
</para>
- session:
+ self:
@key:
@mech_type:
@input:
@@ -2225,7 +2193,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -2240,7 +2208,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -2251,7 +2219,7 @@
</para>
- session:
+ self:
@key:
@mech_type:
@input:
@@ -2266,7 +2234,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -2282,7 +2250,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -2297,7 +2265,7 @@
</para>
- session:
+ self:
@result:
@n_result:
@err:
@@ -2309,7 +2277,7 @@
</para>
- session:
+ self:
@key:
@mech_type:
@wrapped_key:
@@ -2323,7 +2291,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@wrapped_key:
@@ -2337,7 +2305,7 @@
</para>
- session:
+ self:
@result:
@n_result:
@err:
@@ -2349,7 +2317,7 @@
</para>
- session:
+ self:
@key:
@mech_type:
@input:
@@ -2364,7 +2332,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@input:
@@ -2379,7 +2347,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -2390,7 +2358,7 @@
</para>
- session:
+ self:
@key:
@mech_type:
@err:
@@ -2403,7 +2371,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@cancellable:
@@ -2417,7 +2385,7 @@
</para>
- session:
+ self:
@key:
@mech_args:
@cancellable:
@@ -2430,7 +2398,7 @@
</para>
- session:
+ self:
@result:
@err:
@Returns:
@@ -2533,7 +2501,8 @@
</para>
@slot:
- attr:
+ handles:
+ n_handles:
@Returns:
@@ -2542,7 +2511,7 @@
</para>
- object:
+ self:
@Returns:
@@ -2551,7 +2520,7 @@
</para>
- object:
+ self:
@err:
@Returns:
@@ -2561,7 +2530,7 @@
</para>
- object:
+ self:
@additional:
@cancellable:
@err:
@@ -2573,7 +2542,7 @@
</para>
- object:
+ self:
@additional:
@cancellable:
@callback:
@@ -2585,7 +2554,7 @@
</para>
- object:
+ self:
@result:
@err:
@Returns:
@@ -2596,7 +2565,7 @@
</para>
- object:
+ self:
@err:
@Returns:
@@ -2606,7 +2575,7 @@
</para>
- object:
+ self:
@cancellable:
@err:
@Returns:
@@ -2617,7 +2586,7 @@
</para>
- object:
+ self:
@cancellable:
@callback:
@user_data:
@@ -2628,7 +2597,7 @@
</para>
- object:
+ self:
@result:
@err:
@Returns:
@@ -2639,7 +2608,7 @@
</para>
- object:
+ self:
@err:
@Returns:
@@ -2649,7 +2618,7 @@
</para>
- object:
+ self:
@cancellable:
@err:
@Returns:
@@ -2660,7 +2629,7 @@
</para>
- object:
+ self:
@callback:
@user_data:
@@ -2670,7 +2639,7 @@
</para>
- object:
+ self:
@result:
@err:
@Returns:
@@ -2681,7 +2650,7 @@
</para>
- object:
+ self:
@err:
@Varargs:
@Returns:
@@ -2692,7 +2661,7 @@
</para>
- object:
+ self:
@attrs:
@cancellable:
@err:
@@ -2704,7 +2673,7 @@
</para>
- object:
+ self:
@attrs:
@cancellable:
@callback:
@@ -2716,7 +2685,7 @@
</para>
- object:
+ self:
@result:
@err:
@Returns:
@@ -2727,7 +2696,7 @@
</para>
- object:
+ self:
@err:
@Varargs:
@Returns:
@@ -2738,9 +2707,8 @@
</para>
- object:
- attr_types:
- n_attr_types:
+ self:
+ attrs:
@cancellable:
@err:
@Returns:
@@ -2751,9 +2719,8 @@
</para>
- object:
- attr_types:
- n_attr_types:
+ self:
+ attrs:
@cancellable:
@callback:
@user_data:
@@ -2764,53 +2731,7 @@
</para>
- object:
- result:
- err:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_object_get_one ##### -->
-<para>
-
-</para>
-
- object:
- attr_type:
- err:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_object_get_one_full ##### -->
-<para>
-
-</para>
-
- object:
- attr_type:
- cancellable:
- err:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_object_get_one_async ##### -->
-<para>
-
-</para>
-
- object:
- attr_type:
- cancellable:
- callback:
- user_data:
-
-
-<!-- ##### FUNCTION gp11_object_get_one_finish ##### -->
-<para>
-
-</para>
-
- object:
+ self:
@result:
@err:
@Returns:
Modified: trunk/pkcs11/gck/tests/Makefile.am
==============================================================================
--- trunk/pkcs11/gck/tests/Makefile.am (original)
+++ trunk/pkcs11/gck/tests/Makefile.am Mon Jan 5 05:05:44 2009
@@ -3,7 +3,7 @@
asn1-def-test.h
asn1-def-test.h: test.asn
- asn1Parser -o asn1-def-test.h test.asn
+ asn1Parser -o asn1-def-test.h $(srcdir)/test.asn
# Test files should be listed in order they need to run
UNIT_AUTO = \
@@ -15,7 +15,8 @@
unit-test-store.c \
unit-test-memory-store.c \
unit-test-file-store.c \
- unit-test-file-tracker.c
+ unit-test-file-tracker.c \
+ $(BUILT_SOURCES)
UNIT_PROMPT =
Modified: trunk/pkcs11/rpc-layer/Makefile.am
==============================================================================
--- trunk/pkcs11/rpc-layer/Makefile.am (original)
+++ trunk/pkcs11/rpc-layer/Makefile.am Mon Jan 5 05:05:44 2009
@@ -13,9 +13,10 @@
# The dispatch code
libgck_rpc_layer_la_SOURCES = \
- gck-rpc-private.h \
gck-rpc-dispatch.c \
+ gck-rpc-layer.h \
gck-rpc-message.c \
+ gck-rpc-private.h \
gck-rpc-util.c
libgck_rpc_layer_la_LIBADD = \
@@ -58,4 +59,4 @@
gck_rpc_daemon_standalone_LDADD = \
-ldl -lpthread libgck-rpc-layer.la
-
\ No newline at end of file
+
Modified: trunk/pkcs11/ssh-agent/gck-ssh-agent-standalone.c
==============================================================================
--- trunk/pkcs11/ssh-agent/gck-ssh-agent-standalone.c (original)
+++ trunk/pkcs11/ssh-agent/gck-ssh-agent-standalone.c Mon Jan 5 05:05:44 2009
@@ -47,7 +47,7 @@
}
static gboolean
-authenticate_token (GP11Slot *self, gchar *label, gchar **password, gpointer unused)
+authenticate_slot (GP11Module *module, GP11Slot *slot, gchar *label, gchar **password, gpointer unused)
{
gchar *prompt = g_strdup_printf ("Enter token password (%s): ", label);
char *result = getpass (prompt);
@@ -58,7 +58,7 @@
}
static gboolean
-authenticate_object (GP11Slot *self, GP11Object *object, gchar *label, gchar **password)
+authenticate_object (GP11Module *module, GP11Object *object, gchar *label, gchar **password)
{
gchar *prompt = g_strdup_printf ("Enter object password (%s): ", label);
char *result = getpass (prompt);
@@ -100,9 +100,9 @@
slot = g_object_ref (slots->data);
gp11_list_unref_free (slots);
- g_signal_connect (slot, "authenticate-token", G_CALLBACK (authenticate_token), NULL);
- g_signal_connect (slot, "authenticate-object", G_CALLBACK (authenticate_object), NULL);
- gp11_slot_set_auto_login (slot, TRUE);
+ g_signal_connect (module, "authenticate-slot", G_CALLBACK (authenticate_slot), NULL);
+ g_signal_connect (module, "authenticate-object", G_CALLBACK (authenticate_object), NULL);
+ gp11_module_set_auto_authenticate (module, TRUE);
if (!gck_ssh_agent_initialize ("/tmp/test-gck-ssh-agent", slot))
return 1;
Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in (original)
+++ trunk/po/POTFILES.in Mon Jan 5 05:05:44 2009
@@ -17,4 +17,6 @@
daemon/ui/gkr-ask-tool.c
gp11/gp11-misc.c
library/gnome-keyring-utils.c
+pkcs11/gck/gck-certificate.c
+pkcs11/ssh-store/gck-ssh-private-key.c
Added: trunk/po/POTFILES.skip
==============================================================================
--- (empty file)
+++ trunk/po/POTFILES.skip Mon Jan 5 05:05:44 2009
@@ -0,0 +1,2 @@
+daemon/gnome-keyring-daemon.desktop.in
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
