gnome-keyring r1218 - in tags/GNOME_KEYRING_2_23_6: . daemon/pk daemon/ssh po

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Aug  3 21:51:10 2008
New Revision: 1218
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1218&view=rev

Log:
Tag the release


Added:
   tags/GNOME_KEYRING_2_23_6/
      - copied from r1216, /trunk/
   tags/GNOME_KEYRING_2_23_6/ChangeLog
      - copied unchanged from r1217, /trunk/ChangeLog
   tags/GNOME_KEYRING_2_23_6/NEWS
      - copied unchanged from r1217, /trunk/NEWS
   tags/GNOME_KEYRING_2_23_6/po/ChangeLog
      - copied unchanged from r1217, /trunk/po/ChangeLog
Modified:
   tags/GNOME_KEYRING_2_23_6/daemon/pk/gkr-pk-storage.c
   tags/GNOME_KEYRING_2_23_6/daemon/ssh/gkr-ssh-storage.c

Modified: tags/GNOME_KEYRING_2_23_6/daemon/pk/gkr-pk-storage.c
==============================================================================
--- /trunk/daemon/pk/gkr-pk-storage.c	(original)
+++ tags/GNOME_KEYRING_2_23_6/daemon/pk/gkr-pk-storage.c	Sun Aug  3 21:51:10 2008
@@ -417,6 +417,8 @@
 	g_return_val_if_fail (GKR_IS_PK_STORAGE (storage), FALSE);
 	klass = GKR_PK_STORAGE_GET_CLASS (storage);
 	g_return_val_if_fail (klass->load, FALSE);
+	
+g_message("loading location: %s", obj->location ? g_quark_to_string (obj->location) : "NONE");
 	return (klass->load) (storage, obj, err);	
 }
 

Modified: tags/GNOME_KEYRING_2_23_6/daemon/ssh/gkr-ssh-storage.c
==============================================================================
--- /trunk/daemon/ssh/gkr-ssh-storage.c	(original)
+++ tags/GNOME_KEYRING_2_23_6/daemon/ssh/gkr-ssh-storage.c	Sun Aug  3 21:51:10 2008
@@ -328,6 +328,8 @@
 	gchar *comment;
 	gkrid digest;
 	
+g_message("saw PEM block: %s", g_quark_to_string (type));
+
 	/* Only handle SSHv2 private keys */
 	if (type != PEM_RSA_PRIVATE_KEY && type != PEM_DSA_PRIVATE_KEY)
 		return;
@@ -341,6 +343,7 @@
 	
 	/* If it's encrypted ... */
 	dekinfo = gkr_pkix_openssl_get_dekinfo (headers);
+g_message("dekinfo: %s", dekinfo);
 	if (dekinfo) {
 		/* This key was specifically requested to be loaded */
 		if (gkr_id_equals (digest, pv->specific_load_request)) {
@@ -349,6 +352,7 @@
 			
 		/* Nobody's asking us to load this key just yet */
 		} else {
+g_message("skipping loading of wrong key");
 			ctx->result = GKR_PKIX_SUCCESS;
 			sexp = NULL;
 		}
@@ -395,6 +399,7 @@
 	g_return_val_if_fail (loc, FALSE);
 	g_return_val_if_fail (!err || !*err, FALSE);
 	
+g_message("loading SSH private key at: %s", g_quark_to_string (loc));
 	if (!gkr_location_read_file (loc, &data, &n_data, err))
 		return FALSE;