gnome-keyring r1025 - in trunk: . daemon keyrings library pkcs11 pkix ssh

[nnielsen svn gnome org]

Author: nnielsen
Date: Thu Jan 31 14:47:28 2008
New Revision: 1025
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1025&view=rev

Log:
	* keyrings/gkr-keyring.c:
	* ssh/gkr-ssh-daemon-ops.c:
	* ssh/gkr-ssh-proto.c:
	* ssh/gkr-ssh-daemon-io.c:
	* pkcs11/gkr-pkcs11-daemon-session.c:
	* daemon/gkr-daemon-io.c:
	* library/gnome-keyring-proto.c:
	* pkix/gkr-pkix-asn1.c: Fix more compile problems due to 
	glib changing signature of g_realloc.



Modified:
   trunk/ChangeLog
   trunk/daemon/gkr-daemon-io.c
   trunk/keyrings/gkr-keyring.c
   trunk/library/gnome-keyring-proto.c
   trunk/pkcs11/gkr-pkcs11-daemon-session.c
   trunk/pkix/gkr-pkix-asn1.c
   trunk/ssh/gkr-ssh-daemon-io.c
   trunk/ssh/gkr-ssh-daemon-ops.c
   trunk/ssh/gkr-ssh-proto.c

Modified: trunk/daemon/gkr-daemon-io.c
==============================================================================
--- trunk/daemon/gkr-daemon-io.c	(original)
+++ trunk/daemon/gkr-daemon-io.c	Thu Jan 31 14:47:28 2008
@@ -415,7 +415,7 @@
 	/* Make sure keyrings in memory are up to date before doing anything */
 	gkr_keyrings_update ();
 
-	gkr_buffer_init_full (&client->output_buffer, 128, g_realloc);
+	gkr_buffer_init_full (&client->output_buffer, 128, (GkrBufferAllocator)g_realloc);
 	
 	/* Add empty size */
 	gkr_buffer_add_uint32 (&client->output_buffer, 0);

Modified: trunk/keyrings/gkr-keyring.c
==============================================================================
--- trunk/keyrings/gkr-keyring.c	(original)
+++ trunk/keyrings/gkr-keyring.c	Thu Jan 31 14:47:28 2008
@@ -437,7 +437,7 @@
 	if (!file)
 		return FALSE;
 	
-	gkr_buffer_init_full (&out, 4096, g_realloc);
+	gkr_buffer_init_full (&out, 4096, (GkrBufferAllocator)g_realloc);
 
 	/* Generate it */	
 	if (!keyring->password || !keyring->password[0])

Modified: trunk/library/gnome-keyring-proto.c
==============================================================================
--- trunk/library/gnome-keyring-proto.c	(original)
+++ trunk/library/gnome-keyring-proto.c	Thu Jan 31 14:47:28 2008
@@ -116,7 +116,7 @@
                            char **str_ret)
 {
 	return gkr_proto_get_utf8_full (buffer, offset, next_offset, 
-	                                str_ret, g_realloc);
+	                                str_ret, (GkrBufferAllocator)g_realloc);
 }
 
 gboolean

Modified: trunk/pkcs11/gkr-pkcs11-daemon-session.c
==============================================================================
--- trunk/pkcs11/gkr-pkcs11-daemon-session.c	(original)
+++ trunk/pkcs11/gkr-pkcs11-daemon-session.c	Thu Jan 31 14:47:28 2008
@@ -1608,8 +1608,8 @@
 	
 	/* Setup our buffers */
 	/* TODO: Do these need to be secure buffers? */
-	req = gkr_pkcs11_message_new (g_realloc);
-	resp = gkr_pkcs11_message_new (g_realloc);
+	req = gkr_pkcs11_message_new ((GkrBufferAllocator)g_realloc);
+	resp = gkr_pkcs11_message_new ((GkrBufferAllocator)g_realloc);
 	if (!req || !resp)
 		g_error ("out of memory");
 	

Modified: trunk/pkix/gkr-pkix-asn1.c
==============================================================================
--- trunk/pkix/gkr-pkix-asn1.c	(original)
+++ trunk/pkix/gkr-pkix-asn1.c	Thu Jan 31 14:47:28 2008
@@ -123,7 +123,7 @@
 	g_return_val_if_fail (res == ASN1_MEM_ERROR, NULL);
 	
 	if (!alloc)
-		alloc = g_realloc;
+		alloc = (GkrBufferAllocator)g_realloc;
 
 	data = (alloc) (NULL, len);
 	g_return_val_if_fail (data != NULL, NULL);
@@ -235,7 +235,7 @@
 	g_return_val_if_fail (len != NULL, NULL);
 	
 	if (allocator == NULL)
-		allocator = g_realloc;
+		allocator = (GkrBufferAllocator)g_realloc;
 	
 	*len = 0;
 

Modified: trunk/ssh/gkr-ssh-daemon-io.c
==============================================================================
--- trunk/ssh/gkr-ssh-daemon-io.c	(original)
+++ trunk/ssh/gkr-ssh-daemon-io.c	Thu Jan 31 14:47:28 2008
@@ -238,7 +238,7 @@
 	 */
 	/* TODO: Switch to gkr_secure_memory */
 	gkr_buffer_init_full (&client->input_buffer, 128, gkr_secure_realloc);
-	gkr_buffer_init_full (&client->output_buffer, 128, g_realloc);
+	gkr_buffer_init_full (&client->output_buffer, 128, (GkrBufferAllocator)g_realloc);
 
 	client->worker = gkr_async_worker_start (client_worker_main, 
 	                                         client_worker_done, client);

Modified: trunk/ssh/gkr-ssh-daemon-ops.c
==============================================================================
--- trunk/ssh/gkr-ssh-daemon-ops.c	(original)
+++ trunk/ssh/gkr-ssh-daemon-ops.c	Thu Jan 31 14:47:28 2008
@@ -168,7 +168,7 @@
 	int algo;
 	gsize offset;
 	
-	if (!gkr_buffer_get_string (req, 5, &offset, &stype, g_realloc))
+	if (!gkr_buffer_get_string (req, 5, &offset, &stype, (GkrBufferAllocator)g_realloc))
 		return FALSE;
 		
 	algo = gkr_ssh_proto_keytype_to_algo (stype);
@@ -200,7 +200,7 @@
 	/* TODO: Blinding? See ssh-agent.c */
 
 	/* Get the comment */
-	if (!gkr_buffer_get_string (req, offset, &offset, &comment, g_realloc)) {
+	if (!gkr_buffer_get_string (req, offset, &offset, &comment, (GkrBufferAllocator)g_realloc)) {
 		gcry_sexp_release (key);
 		return FALSE;
 	}

Modified: trunk/ssh/gkr-ssh-proto.c
==============================================================================
--- trunk/ssh/gkr-ssh-proto.c	(original)
+++ trunk/ssh/gkr-ssh-proto.c	Thu Jan 31 14:47:28 2008
@@ -106,7 +106,7 @@
 		return FALSE;
 	
 	/* The string algorithm */
-	if (!gkr_buffer_get_string (req, *offset, offset, &stype, g_realloc))
+	if (!gkr_buffer_get_string (req, *offset, offset, &stype, (GkrBufferAllocator)g_realloc))
 		return FALSE;
 	
 	alg = gkr_ssh_proto_keytype_to_algo (stype);