gnome-keyring r1488 - in trunk: . pkcs11/rpc-layer

[nnielsen svn gnome org]

Author: nnielsen
Date: Fri Jan 30 22:23:44 2009
New Revision: 1488
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1488&view=rev

Log:
	* pkcs11/rpc-layer/gck-rpc-dispatch.c:
	* pkcs11/rpc-layer/gck-rpc-module.c: Build fix. Patch by  Saleem Abdulrasool
	Fixes bug #568378


Modified:
   trunk/ChangeLog
   trunk/pkcs11/rpc-layer/gck-rpc-dispatch.c
   trunk/pkcs11/rpc-layer/gck-rpc-module.c

Modified: trunk/pkcs11/rpc-layer/gck-rpc-dispatch.c
==============================================================================
--- trunk/pkcs11/rpc-layer/gck-rpc-dispatch.c	(original)
+++ trunk/pkcs11/rpc-layer/gck-rpc-dispatch.c	Fri Jan 30 22:23:44 2009
@@ -202,7 +202,7 @@
 	GckRpcMessage *msg;
 	const unsigned char *data;
 	unsigned char valid;
-	uint32_t n_data;
+	size_t n_data;
 	
 	assert (cs);
 	

Modified: trunk/pkcs11/rpc-layer/gck-rpc-module.c
==============================================================================
--- trunk/pkcs11/rpc-layer/gck-rpc-module.c	(original)
+++ trunk/pkcs11/rpc-layer/gck-rpc-module.c	Fri Jan 30 22:23:44 2009
@@ -758,7 +758,7 @@
 	
 	/* If not valid, then just the length is encoded, this can signify CKR_BUFFER_TOO_SMALL */
 	if (!valid) {
-		if (!egg_buffer_get_uint32 (&msg->buffer, msg->parsed, &msg->parsed, &vlen))
+		if (!egg_buffer_get_uint32 (&msg->buffer, msg->parsed, &msg->parsed, (uint32_t *)&vlen))
 			return PARSE_ERROR;
 		
 		*len = vlen;