gnome-keyring r1513 - in trunk: . daemon/pk daemon/pk/tests pkcs11

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Feb  7 23:23:17 2009
New Revision: 1513
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1513&view=rev

Log:
Remove the trust bits since they're very ambiguous and not necessary.

Modified:
   trunk/ChangeLog
   trunk/daemon/pk/gkr-pk-cert.c
   trunk/daemon/pk/gkr-pk-netscape-trust.c
   trunk/daemon/pk/gkr-pk-util.c
   trunk/daemon/pk/tests/unit-test-pk-cert.c
   trunk/pkcs11/pkcs11g.h

Modified: trunk/daemon/pk/gkr-pk-cert.c
==============================================================================
--- trunk/daemon/pk/gkr-pk-cert.c	(original)
+++ trunk/daemon/pk/gkr-pk-cert.c	Sat Feb  7 23:23:17 2009
@@ -211,6 +211,7 @@
 	get_public_key (cert);
 }
 
+#if 0
 static gboolean
 has_private_key (GkrPkCert *cert)
 {
@@ -221,6 +222,7 @@
 	
 	return gkr_pk_manager_find_by_id (GKR_PK_OBJECT (cert)->manager, GKR_TYPE_PK_PRIVKEY, id) != NULL;	
 }
+#endif
 
 static gboolean 
 has_certificate_purposes (GkrPkCert *cert)
@@ -410,7 +412,9 @@
 	const guchar *cdata = NULL;
 	gkrconstid keyid;
 	CK_ULONG value;
+#if 0
 	gchar *index;
+#endif
 	guchar *data;
 	gsize n_data;
 	time_t time;
@@ -491,7 +495,7 @@
 			
 		gkr_pk_attribute_set_ulong (attr, value);
 		return CKR_OK;
-	
+#if 0	
 	case CKA_GNOME_USER_TRUST:
 		value = CKT_GNOME_UNKNOWN;
 		
@@ -510,7 +514,7 @@
 		} 
 		gkr_pk_attribute_set_ulong (attr, value);
 		return CKR_OK;
-		
+#endif		
 	case CKA_ID:
 		if ((ret = load_certificate (cert)) != CKR_OK)
 			return ret;

Modified: trunk/daemon/pk/gkr-pk-netscape-trust.c
==============================================================================
--- trunk/daemon/pk/gkr-pk-netscape-trust.c	(original)
+++ trunk/daemon/pk/gkr-pk-netscape-trust.c	Sat Feb  7 23:23:17 2009
@@ -146,7 +146,7 @@
 		*val = CKT_NETSCAPE_UNTRUSTED;
 		return CKR_OK;
 	}	
-		
+#if 0		
 	/* Ascertain the trust in this certificate */
 	ret = gkr_pk_object_get_ulong (GKR_PK_OBJECT (trust->certificate), 
 	                               CKA_GNOME_USER_TRUST, &nval);
@@ -166,7 +166,7 @@
 		g_return_val_if_reached (CKR_GENERAL_ERROR);
 		break;
 	};
-	
+#endif
 	/* See if we can delegate the purpase (ie: CA) */
 	ret = gkr_pk_object_get_ulong (GKR_PK_OBJECT (trust->certificate),
 	                               CKA_CERTIFICATE_CATEGORY, &nval);

Modified: trunk/daemon/pk/gkr-pk-util.c
==============================================================================
--- trunk/daemon/pk/gkr-pk-util.c	(original)
+++ trunk/daemon/pk/gkr-pk-util.c	Sat Feb  7 23:23:17 2009
@@ -74,7 +74,9 @@
 	case CKA_TRUST_IPSEC_TUNNEL:
 	case CKA_TRUST_IPSEC_USER:
 	case CKA_TRUST_TIME_STAMPING:
+#if 0
 	case CKA_GNOME_USER_TRUST:
+#endif
 		return GKR_PK_DATA_ULONG;
 
 	/* CK_BBOOL attribute types */

Modified: trunk/daemon/pk/tests/unit-test-pk-cert.c
==============================================================================
--- trunk/daemon/pk/tests/unit-test-pk-cert.c	(original)
+++ trunk/daemon/pk/tests/unit-test-pk-cert.c	Sat Feb  7 23:23:17 2009
@@ -170,6 +170,7 @@
 
 void unit_test_certificate_trust (CuTest *cu)
 {
+#if 0
 	/* Should be trusted because we have the private key */
 	CHECK_ULONG_ATTRIBUTE (cu, certificate_1, CKA_GNOME_USER_TRUST, CKT_GNOME_TRUSTED);
 	
@@ -189,7 +190,8 @@
 	/* Mark as untrusted */
 	/* TODO: Should do this via attribute once writable */
 	gkr_pk_object_index_set_string (GKR_PK_OBJECT (certificate_1), "user-trust", "untrusted");
-	CHECK_ULONG_ATTRIBUTE (cu, certificate_1, CKA_GNOME_USER_TRUST, CKT_GNOME_UNTRUSTED);	
+	CHECK_ULONG_ATTRIBUTE (cu, certificate_1, CKA_GNOME_USER_TRUST, CKT_GNOME_UNTRUSTED);
+#endif
 }
 
 void unit_test_certificate_purpose (CuTest *cu)

Modified: trunk/pkcs11/pkcs11g.h
==============================================================================
--- trunk/pkcs11/pkcs11g.h	(original)
+++ trunk/pkcs11/pkcs11g.h	Sat Feb  7 23:23:17 2009
@@ -88,24 +88,9 @@
 /* A string unique among all objects on a given machine */
 #define CKA_GNOME_UNIQUE                            (CKA_GNOME + 350)
 
-
-/* ----------------------------------------------------------------------
- * TODO: EXTENSIONS BELOW NEED TO BE INDIVIDUALLY CONSIDERED CAREFULLY
- */
-
-#define CKT_GNOME_UNKNOWN   0
-#define CKT_GNOME_UNTRUSTED 1
-#define CKT_GNOME_TRUSTED   2
-
-/*
- * 
- * CK_ULONG
- * 
- *  - CKT_GNOME_TRUSTED 
- *  - CKT_GNOME_UNTRUSTED
- *  - CKT_GNOME_UNKNOWN
+/* -------------------------------------------------------------------
+ * PURPOSES
  */
-#define CKA_GNOME_USER_TRUST                     (CKA_GNOME + 10)
 
 /*
  * Whether the key or certificate is restricted to a set of