gnome-keyring r1622 - in trunk: . daemon/pkcs11

[nnielsen svn gnome org]

Author: nnielsen
Date: Fri Feb 27 01:00:00 2009
New Revision: 1622
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1622&view=rev

Log:
Don't automatically initialize tokens without user pin.

This leads to erroneous prompts at unexpected times.

Modified:
   trunk/ChangeLog
   trunk/daemon/pkcs11/gkr-pkcs11-auth-ep.c

Modified: trunk/daemon/pkcs11/gkr-pkcs11-auth-ep.c
==============================================================================
--- trunk/daemon/pkcs11/gkr-pkcs11-auth-ep.c	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-auth-ep.c	Fri Feb 27 01:00:00 2009
@@ -509,19 +509,6 @@
 	/* Try the login first, this allows NULL logins to be tried */
 	rv = (pkcs11_lower->C_Login) (handle, user_type, pin, pin_len);
 	
-	if (rv == CKR_USER_PIN_NOT_INITIALIZED) {
-
-		/* 
-		 * Try and initialize the token login, gnome-keyring modules allow 
-		 * C_SetPIN to be called on with a NULL if no user pin has yet been set.
-		 */
-		
-		if (user_type == CKU_USER) 
-			return perform_set_user_pin (handle, NULL, 0, NULL, 0, TRUE);
-		
-		return rv;
-	}
-
 	/* See if we can help the login to work */
 	if (rv != CKR_PIN_INCORRECT)
 		return rv;