gnome-keyring r1438 - in trunk: . gp11 pkcs11/gck

[nnielsen svn gnome org]

Author: nnielsen
Date: Mon Jan  5 22:51:13 2009
New Revision: 1438
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1438&view=rev

Log:
	* pkcs11/gck/gck-module.c: Fix broken release, I have no idea
	why it distchecked.

	* gp11/gp11-slot.c: 
	* pkcs11/gck/gck-data-asn1.c:
	* pkcs11/gck/gck-data-pem.c: Fix compiler warnings.


Modified:
   trunk/ChangeLog
   trunk/gp11/gp11-slot.c
   trunk/pkcs11/gck/gck-data-asn1.c
   trunk/pkcs11/gck/gck-data-pem.c
   trunk/pkcs11/gck/gck-module.c

Modified: trunk/gp11/gp11-slot.c
==============================================================================
--- trunk/gp11/gp11-slot.c	(original)
+++ trunk/gp11/gp11-slot.c	Mon Jan  5 22:51:13 2009
@@ -444,7 +444,7 @@
 	CK_SLOT_ID handle = (CK_SLOT_ID)-1;
 	CK_FUNCTION_LIST_PTR funcs;
 	GP11Module *module = NULL;
-	CK_MECHANISM_TYPE_PTR mech_list;
+	CK_MECHANISM_TYPE_PTR mech_list = NULL;
 	CK_ULONG count, i;
 	GP11Mechanisms *result;
 	CK_RV rv;

Modified: trunk/pkcs11/gck/gck-data-asn1.c
==============================================================================
--- trunk/pkcs11/gck/gck-data-asn1.c	(original)
+++ trunk/pkcs11/gck/gck-data-asn1.c	Mon Jan  5 22:51:13 2009
@@ -1040,7 +1040,7 @@
 gchar*
 gck_data_asn1_read_dn_part (ASN1_TYPE asn, const gchar *part, const gchar *match)
 {
-	PrintableOid *printable;
+	PrintableOid *printable = NULL;
 	gboolean done = FALSE;
 	guchar *value;
 	gsize n_value;

Modified: trunk/pkcs11/gck/gck-data-pem.c
==============================================================================
--- trunk/pkcs11/gck/gck-data-pem.c	(original)
+++ trunk/pkcs11/gck/gck-data-pem.c	Mon Jan  5 22:51:13 2009
@@ -27,6 +27,8 @@
 
 #include <glib.h>
 
+#include <gcrypt.h>
+
 #include <ctype.h>
 #include <string.h>
 

Modified: trunk/pkcs11/gck/gck-module.c
==============================================================================
--- trunk/pkcs11/gck/gck-module.c	(original)
+++ trunk/pkcs11/gck/gck-module.c	Mon Jan  5 22:51:13 2009
@@ -710,7 +710,7 @@
 	g_return_val_if_fail (slot_list, CKR_ARGUMENTS_BAD);
 	
 	/* Answer C_GetSlotList with 0 for app */
-	slot_list[0] = CK_GNOME_VIRTUAL_SLOT_ID (GCK_SLOT_ID, 0);
+	slot_list[0] = CK_GNOME_MAKE_APPARTMENT (GCK_SLOT_ID, 0);
 	*count = 1;
 	return CKR_OK;
 }
@@ -722,7 +722,7 @@
 	
 	g_return_val_if_fail (GCK_IS_MODULE (self), CKR_CRYPTOKI_NOT_INITIALIZED);
 	
-	if (CK_GNOME_VIRTUAL_TO_SLOT (id) != GCK_SLOT_ID)
+	if (CK_GNOME_APPARTMENT_SLOT (id) != GCK_SLOT_ID)
 		return CKR_SLOT_ID_INVALID;
 	if (info == NULL)
 		return CKR_ARGUMENTS_BAD;
@@ -748,7 +748,7 @@
 	
 	g_return_val_if_fail (GCK_IS_MODULE (self), CKR_CRYPTOKI_NOT_INITIALIZED);
 	
-	if (CK_GNOME_VIRTUAL_TO_SLOT (id) != GCK_SLOT_ID)
+	if (CK_GNOME_APPARTMENT_SLOT (id) != GCK_SLOT_ID)
 		return CKR_SLOT_ID_INVALID;
 	if (info == NULL)
 		return CKR_ARGUMENTS_BAD;
@@ -781,7 +781,7 @@
 	
 	g_return_val_if_fail (GCK_IS_MODULE (self), CKR_CRYPTOKI_NOT_INITIALIZED);
 	
-	if (CK_GNOME_VIRTUAL_TO_SLOT (id) != GCK_SLOT_ID)
+	if (CK_GNOME_APPARTMENT_SLOT (id) != GCK_SLOT_ID)
 		return CKR_SLOT_ID_INVALID;
 	if (count == NULL)
 		return CKR_ARGUMENTS_BAD;
@@ -814,7 +814,7 @@
 	
 	g_return_val_if_fail (GCK_IS_MODULE (self), CKR_CRYPTOKI_NOT_INITIALIZED);
 	
-	if (CK_GNOME_VIRTUAL_TO_SLOT (id) != GCK_SLOT_ID)
+	if (CK_GNOME_APPARTMENT_SLOT (id) != GCK_SLOT_ID)
 		return CKR_SLOT_ID_INVALID;
 	if (info == NULL)
 		return CKR_ARGUMENTS_BAD;
@@ -849,7 +849,7 @@
 	
 	g_return_val_if_fail (GCK_IS_MODULE (self), CKR_CRYPTOKI_NOT_INITIALIZED);
 	
-	if (CK_GNOME_VIRTUAL_TO_SLOT (id) != GCK_SLOT_ID)
+	if (CK_GNOME_APPARTMENT_SLOT (id) != GCK_SLOT_ID)
 		return CKR_SLOT_ID_INVALID;
 	if (!result)
 		return CKR_ARGUMENTS_BAD;
@@ -922,7 +922,7 @@
 	
 	g_return_val_if_fail (GCK_IS_MODULE (self), CKR_CRYPTOKI_NOT_INITIALIZED);
 	
-	if (CK_GNOME_VIRTUAL_TO_SLOT (id) != GCK_SLOT_ID)
+	if (CK_GNOME_APPARTMENT_SLOT (id) != GCK_SLOT_ID)
 		return CKR_SLOT_ID_INVALID;
 
 	/* Calculate the virtual slot */