gnome-keyring r1460 - in trunk: . daemon/pkcs11 pkcs11/gck pkcs11/plex-layer

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Jan 17 20:27:12 2009
New Revision: 1460
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1460&view=rev

Log:
	* configure.in:
	* daemon/pkcs11/gkr-pkcs11-auth.c:
	* pkcs11/gck/gck-data-file.c:
	* pkcs11/plex-layer/gck-plex-layer.c: Build and warning fixes.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/daemon/pkcs11/gkr-pkcs11-auth.c
   trunk/pkcs11/gck/gck-data-file.c
   trunk/pkcs11/plex-layer/gck-plex-layer.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Jan 17 20:27:12 2009
@@ -515,7 +515,6 @@
 pkcs11/ssh-store/Makefile
 pkcs11/ssh-store/tests/Makefile
 pkcs11/user-store/Makefile
-pkcs11/user-store/tests/Makefile
 po/Makefile.in
 tests/Makefile
 tool/Makefile

Modified: trunk/daemon/pkcs11/gkr-pkcs11-auth.c
==============================================================================
--- trunk/daemon/pkcs11/gkr-pkcs11-auth.c	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-auth.c	Sat Jan 17 20:27:12 2009
@@ -374,7 +374,6 @@
 	flags = GKR_ASK_REQUEST_PASSWORD | GKR_ASK_REQUEST_OK_DENY_BUTTONS;
 	ask = gkr_ask_request_new (_("Unlock certificate/key storage"), 
 	                           _("Enter password to unlock the certificate/key storage"), flags); 
-	gkr_ask_request_set_secondary (ask, secondary);
 	
 	secondary = g_strdup_printf (_("An application wants access to the certificate/key storage '%s', but it is locked"), label);
 	gkr_ask_request_set_secondary (ask, secondary);

Modified: trunk/pkcs11/gck/gck-data-file.c
==============================================================================
--- trunk/pkcs11/gck/gck-data-file.c	(original)
+++ trunk/pkcs11/gck/gck-data-file.c	Sat Jan 17 20:27:12 2009
@@ -562,7 +562,7 @@
 		/* Make sure we have this one */
 		sect = GPOINTER_TO_UINT (g_hash_table_lookup (self->identifiers, str));
 		if (sect != section) {
-			g_message ("data file entry in wrong section: %s", identifier);
+			g_message ("data file entry in wrong section: %s", str);
 			g_free (str);
 			return GCK_DATA_FAILURE;
 		}

Modified: trunk/pkcs11/plex-layer/gck-plex-layer.c
==============================================================================
--- trunk/pkcs11/plex-layer/gck-plex-layer.c	(original)
+++ trunk/pkcs11/plex-layer/gck-plex-layer.c	Sat Jan 17 20:27:12 2009
@@ -850,6 +850,7 @@
 	if (priv_key == NULL || pub_key == NULL)
 		return CKR_ARGUMENTS_BAD;
 	
+	MAP_SESSION_DOWN (handle, map);
 	rv = (map.funcs->C_GenerateKeyPair) (handle, mechanism, pub_template, pub_count, priv_template, priv_count, pub_key, priv_key);
 	if (rv == CKR_OK) {
 		MAP_OBJECT_UP (map, *pub_key);
@@ -881,6 +882,7 @@
 	if (key == NULL)
 		return CKR_ARGUMENTS_BAD;
 	
+	MAP_SESSION_DOWN (handle, map);
 	rv = (map.funcs->C_UnwrapKey) (handle, mechanism, unwrapping_key, wrapped_key, wrapped_key_len, template, count, key);
 	if (rv == CKR_OK)
 		MAP_OBJECT_UP (map, *key);
@@ -899,6 +901,7 @@
 	if (key == NULL)
 		return CKR_ARGUMENTS_BAD;
 	
+	MAP_SESSION_DOWN (handle, map);
 	rv = (map.funcs->C_DeriveKey) (handle, mechanism, base_key, template, count, key);
 	if (rv == CKR_OK)
 		MAP_OBJECT_UP (map, *key);