x86_64 build fixes. Patch by Dan Winship

	* common/gkr-crypto.c:
	* pk/gkr-pk-object-manager.c:
	* pk/gkr-pk-privkey.c:
	* pk/gkr-pk-pubkey.c:
	* pk/gkr-pk-util.c:
	* pk/gkr-pk-util.h:
	* pkcs11/gkr-pkcs11-daemon-session.c:
	* pkix/gkr-pkix-cert.c:
	* pkix/gkr-pkix-der.c: x86_64 build fixes. Patch by Dan Winship

svn path=/trunk/; revision=940

5 files changed, 7 insertions, 7 deletions

diff --git a/pk/gkr-pk-object-manager.c b/pk/gkr-pk-object-manager.c
index db537d73..8fa0f9cd 100644
--- a/pk/gkr-pk-object-manager.c
+++ b/pk/gkr-pk-object-manager.c
@@ -337,7 +337,7 @@ gkr_pk_object_manager_findv (GkrPkObjectManager *objmgr, GType gtype, ...)
 		switch (gkr_pk_attribute_data_type (attr.type)) {
 		case GKR_PK_DATA_ULONG:
 			uval = va_arg (va, CK_ULONG);
-			gkr_pk_attribute_set_uint (&attr, uval);
+			gkr_pk_attribute_set_ulong (&attr, uval);
 			spacer = va_arg (va, CK_ULONG);
 			break;
 		
diff --git a/pk/gkr-pk-privkey.c b/pk/gkr-pk-privkey.c
index a50217bb..50fafec7 100644
--- a/pk/gkr-pk-privkey.c
+++ b/pk/gkr-pk-privkey.c
@@ -323,7 +323,7 @@ static CK_RV
 gkr_pk_privkey_get_ulong_attribute (GkrPkObject* obj, CK_ATTRIBUTE_PTR attr)
 {
 	GkrPkPrivkey *key = GKR_PK_PRIVKEY (obj);
-	guint val;
+	gulong val;
 	
 	switch (attr->type)
 	{
@@ -346,7 +346,7 @@ gkr_pk_privkey_get_ulong_attribute (GkrPkObject* obj, CK_ATTRIBUTE_PTR attr)
 		return CKR_ATTRIBUTE_TYPE_INVALID;
 	};
 	
-	gkr_pk_attribute_set_uint (attr, val);
+	gkr_pk_attribute_set_ulong (attr, val);
 	return CKR_OK;
 }
 
diff --git a/pk/gkr-pk-pubkey.c b/pk/gkr-pk-pubkey.c
index abdfe584..af1f57e8 100644
--- a/pk/gkr-pk-pubkey.c
+++ b/pk/gkr-pk-pubkey.c
@@ -278,7 +278,7 @@ gkr_pk_pubkey_get_ulong_attribute (GkrPkObject* obj, CK_ATTRIBUTE_PTR attr)
 	GkrPkPubkey *key = GKR_PK_PUBKEY (obj);
 	gcry_mpi_t mpi;
 	gboolean ret;
-	guint val;
+	gulong val;
 	
 	switch (attr->type)
 	{
@@ -322,7 +322,7 @@ gkr_pk_pubkey_get_ulong_attribute (GkrPkObject* obj, CK_ATTRIBUTE_PTR attr)
 		return CKR_ATTRIBUTE_TYPE_INVALID;
 	};
 	
-	gkr_pk_attribute_set_uint (attr, val);
+	gkr_pk_attribute_set_ulong (attr, val);
 	return CKR_OK;
 }
 
diff --git a/pk/gkr-pk-util.c b/pk/gkr-pk-util.c
index 1dcc0c0c..8c9cedae 100644
--- a/pk/gkr-pk-util.c
+++ b/pk/gkr-pk-util.c
@@ -269,7 +269,7 @@ gkr_pk_attribute_set_unique (CK_ATTRIBUTE_PTR attr, gkrconstunique uni)
 }
 
 void
-gkr_pk_attribute_set_uint (CK_ATTRIBUTE_PTR attr, guint value)
+gkr_pk_attribute_set_ulong (CK_ATTRIBUTE_PTR attr, gulong value)
 {
 	g_assert (attr);
 	
diff --git a/pk/gkr-pk-util.h b/pk/gkr-pk-util.h
index 52cdf1c2..d840537a 100644
--- a/pk/gkr-pk-util.h
+++ b/pk/gkr-pk-util.h
@@ -66,7 +66,7 @@ void               gkr_pk_attribute_set_boolean           (CK_ATTRIBUTE_PTR attr
 
 void               gkr_pk_attribute_set_date              (CK_ATTRIBUTE_PTR attr, time_t time);
 
-void               gkr_pk_attribute_set_uint              (CK_ATTRIBUTE_PTR attr, guint value);
+void               gkr_pk_attribute_set_ulong             (CK_ATTRIBUTE_PTR attr, gulong value);
 
 void               gkr_pk_attribute_set_mpi               (CK_ATTRIBUTE_PTR attr, gcry_mpi_t mpi);