GNOME.org
 

[gnome-keyring/trust-store] Use term 'distrust' instead of 'untrust'

commit 5470f81b5a0213ef4a1c46aa96ec969bc956cd5c
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Dec 13 17:26:51 2010 +0000

    Use term 'distrust' instead of 'untrust'
    
    Suggested by Yaron Sheffer and describes the concept much
    more aptly.

 gck/gck-dump.c                          |    2 +-
 pkcs11/gkm/gkm-trust.c                  |    2 +-
 pkcs11/gkm/gkm-trust.h                  |    2 +-
 pkcs11/pkcs11x.h                        |    2 +-
 pkcs11/roots-store/gkm-roots-trust.c    |    6 ++--
 pkcs11/xdg-store/gkm-xdg-assertion.c    |    2 +-
 pkcs11/xdg-store/gkm-xdg-trust.c        |   16 +++++++-------
 pkcs11/xdg-store/tests/test-xdg-trust.c |   36 +++++++++++++++---------------
 tool/gkr-tool-trust.c                   |    8 +++---
 9 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/gck/gck-dump.c b/gck/gck-dump.c
index ca488b0..98de10b 100644
--- a/gck/gck-dump.c
+++ b/gck/gck-dump.c
@@ -67,7 +67,7 @@ dump_assertion_type_value (gulong type)
 {
 	switch (type) {
 	#define DX(x) case x: g_printerr ("%s", #x); break;
-	DX(CKT_X_UNTRUSTED_CERTIFICATE);
+	DX(CKT_X_DISTRUSTED_CERTIFICATE);
 	DX(CKT_X_PINNED_CERTIFICATE);
 	DX(CKT_X_ANCHORED_CERTIFICATE);
 	#undef DX
diff --git a/pkcs11/gkm/gkm-trust.c b/pkcs11/gkm/gkm-trust.c
index 5389429..22b0e6a 100644
--- a/pkcs11/gkm/gkm-trust.c
+++ b/pkcs11/gkm/gkm-trust.c
@@ -50,7 +50,7 @@ trust_get_usage (GkmTrust *self, const gchar *purpose, CK_ATTRIBUTE_PTR attr)
 	case GKM_TRUST_UNKNOWN:
 		trust = CKT_NETSCAPE_TRUST_UNKNOWN;
 		break;
-	case GKM_TRUST_UNTRUSTED:
+	case GKM_TRUST_DISTRUSTED:
 		trust = CKT_NETSCAPE_UNTRUSTED;
 		break;
 	case GKM_TRUST_TRUSTED:
diff --git a/pkcs11/gkm/gkm-trust.h b/pkcs11/gkm/gkm-trust.h
index 7bb1f15..82e81ee 100644
--- a/pkcs11/gkm/gkm-trust.h
+++ b/pkcs11/gkm/gkm-trust.h
@@ -28,7 +28,7 @@
 
 typedef enum _GkmTrustLevel {
 	GKM_TRUST_UNKNOWN = 0,
-	GKM_TRUST_UNTRUSTED = 1,
+	GKM_TRUST_DISTRUSTED = 1,
 	GKM_TRUST_TRUSTED = 2,
 	GKM_TRUST_ANCHOR = 3,
 } GkmTrustLevel;
diff --git a/pkcs11/pkcs11x.h b/pkcs11/pkcs11x.h
index 365e799..d836dea 100644
--- a/pkcs11/pkcs11x.h
+++ b/pkcs11/pkcs11x.h
@@ -35,7 +35,7 @@
 
 typedef CK_ULONG CK_X_ASSERTION_TYPE;
 
-#define CKT_X_UNTRUSTED_CERTIFICATE              1UL
+#define CKT_X_DISTRUSTED_CERTIFICATE             1UL
 
 #define CKT_X_PINNED_CERTIFICATE                 2UL
 
diff --git a/pkcs11/roots-store/gkm-roots-trust.c b/pkcs11/roots-store/gkm-roots-trust.c
index b07e6ea..93da42b 100644
--- a/pkcs11/roots-store/gkm-roots-trust.c
+++ b/pkcs11/roots-store/gkm-roots-trust.c
@@ -178,8 +178,8 @@ build_linked_assertion (GkmRootsTrust *self, GkmTrustLevel level, const gchar *p
 	case GKM_TRUST_TRUSTED:
 		type = CKT_X_PINNED_CERTIFICATE;
 		break;
-	case GKM_TRUST_UNTRUSTED:
-		type = CKT_X_UNTRUSTED_CERTIFICATE;
+	case GKM_TRUST_DISTRUSTED:
+		type = CKT_X_DISTRUSTED_CERTIFICATE;
 		break;
 	case GKM_TRUST_ANCHOR:
 		type = CKT_X_ANCHORED_CERTIFICATE;
@@ -290,7 +290,7 @@ gkm_roots_trust_get_trust_level (GkmTrust *base, const gchar *purpose)
 		result = GKM_TRUST_TRUSTED;
 
 	} else {
-		result = GKM_TRUST_UNTRUSTED;
+		result = GKM_TRUST_DISTRUSTED;
 		oid = g_quark_try_string (purpose);
 		for (usage = usages; *usage; ++usage) {
 			if (*usage == oid) {
diff --git a/pkcs11/xdg-store/gkm-xdg-assertion.c b/pkcs11/xdg-store/gkm-xdg-assertion.c
index e67633d..c8eea88 100644
--- a/pkcs11/xdg-store/gkm-xdg-assertion.c
+++ b/pkcs11/xdg-store/gkm-xdg-assertion.c
@@ -80,7 +80,7 @@ lookup_or_create_trust_object (GkmSession *session, GkmManager *manager,
 		n_lookups = 2;
 		break;
 
-	case CKT_X_UNTRUSTED_CERTIFICATE:
+	case CKT_X_DISTRUSTED_CERTIFICATE:
 		serial = gkm_attributes_find (attrs, n_attrs, CKA_SERIAL_NUMBER);
 		issuer = gkm_attributes_find (attrs, n_attrs, CKA_ISSUER);
 		if (!serial || !issuer) {
diff --git a/pkcs11/xdg-store/gkm-xdg-trust.c b/pkcs11/xdg-store/gkm-xdg-trust.c
index 7686271..a6f225f 100644
--- a/pkcs11/xdg-store/gkm-xdg-trust.c
+++ b/pkcs11/xdg-store/gkm-xdg-trust.c
@@ -74,7 +74,7 @@ static void remove_assertion_from_trust (GkmXdgTrust *self, GkmAssertion *assert
  */
 
 static GQuark TRUST_UNKNOWN;
-static GQuark TRUST_UNTRUSTED;
+static GQuark TRUST_DISTRUSTED;
 static GQuark TRUST_TRUSTED;
 static GQuark TRUST_TRUSTED_ANCHOR;
 
@@ -89,7 +89,7 @@ init_quarks (void)
 			name = g_quark_from_static_string(value)
 
 		QUARK (TRUST_UNKNOWN, "trustUnknown");
-		QUARK (TRUST_UNTRUSTED, "untrusted");
+		QUARK (TRUST_DISTRUSTED, "distrusted");
 		QUARK (TRUST_TRUSTED, "trusted");
 		QUARK (TRUST_TRUSTED_ANCHOR, "trustedAnchor");
 
@@ -224,8 +224,8 @@ static GQuark
 assertion_type_to_level_enum (CK_X_ASSERTION_TYPE type)
 {
 	switch (type) {
-	case CKT_X_UNTRUSTED_CERTIFICATE:
-		return TRUST_UNTRUSTED;
+	case CKT_X_DISTRUSTED_CERTIFICATE:
+		return TRUST_DISTRUSTED;
 	case CKT_X_ANCHORED_CERTIFICATE:
 		return TRUST_TRUSTED_ANCHOR;
 	case CKT_X_PINNED_CERTIFICATE:
@@ -238,8 +238,8 @@ assertion_type_to_level_enum (CK_X_ASSERTION_TYPE type)
 static gboolean
 level_enum_to_assertion_type (GQuark level, CK_X_ASSERTION_TYPE *type)
 {
-	if (level == TRUST_UNTRUSTED)
-		*type = CKT_X_UNTRUSTED_CERTIFICATE;
+	if (level == TRUST_DISTRUSTED)
+		*type = CKT_X_DISTRUSTED_CERTIFICATE;
 	else if (level == TRUST_TRUSTED_ANCHOR)
 		*type = CKT_X_ANCHORED_CERTIFICATE;
 	else if (level == TRUST_TRUSTED)
@@ -658,8 +658,8 @@ gkm_xdg_trust_get_level (GkmTrust *base, const gchar *purpose)
 		return GKM_TRUST_ANCHOR;
 	else if (type == CKT_X_PINNED_CERTIFICATE)
 		return GKM_TRUST_TRUSTED;
-	else if (type == CKT_X_UNTRUSTED_CERTIFICATE)
-		return GKM_TRUST_UNTRUSTED;
+	else if (type == CKT_X_DISTRUSTED_CERTIFICATE)
+		return GKM_TRUST_DISTRUSTED;
 	else
 		g_return_val_if_reached (GKM_TRUST_UNKNOWN);
 }
diff --git a/pkcs11/xdg-store/tests/test-xdg-trust.c b/pkcs11/xdg-store/tests/test-xdg-trust.c
index 622d5fc..bb2d329 100644
--- a/pkcs11/xdg-store/tests/test-xdg-trust.c
+++ b/pkcs11/xdg-store/tests/test-xdg-trust.c
@@ -389,10 +389,10 @@ TESTING_TEST (trust_create_assertion_null_cert_value)
 	gkm_assert_cmprv (rv, ==, CKR_ATTRIBUTE_VALUE_INVALID);
 }
 
-TESTING_TEST (trust_create_assertion_for_untrusted)
+TESTING_TEST (trust_create_assertion_for_distrusted)
 {
 	CK_OBJECT_CLASS klass = CKO_X_TRUST_ASSERTION;
-	CK_X_ASSERTION_TYPE atype = CKT_X_UNTRUSTED_CERTIFICATE;
+	CK_X_ASSERTION_TYPE atype = CKT_X_DISTRUSTED_CERTIFICATE;
 	CK_OBJECT_HANDLE object = 0;
 	CK_OBJECT_HANDLE check = 0;
 	CK_ULONG n_objects = 0;
@@ -421,10 +421,10 @@ TESTING_TEST (trust_create_assertion_for_untrusted)
 	gkm_assert_cmpulong (check, ==, object);
 }
 
-TESTING_TEST (trust_create_assertion_for_untrusted_no_purpose)
+TESTING_TEST (trust_create_assertion_for_distrusted_no_purpose)
 {
 	CK_OBJECT_CLASS klass = CKO_X_TRUST_ASSERTION;
-	CK_X_ASSERTION_TYPE atype = CKT_X_UNTRUSTED_CERTIFICATE;
+	CK_X_ASSERTION_TYPE atype = CKT_X_DISTRUSTED_CERTIFICATE;
 	CK_OBJECT_HANDLE object = 0;
 	CK_RV rv;
 
@@ -439,10 +439,10 @@ TESTING_TEST (trust_create_assertion_for_untrusted_no_purpose)
 	gkm_assert_cmprv (rv, ==, CKR_TEMPLATE_INCOMPLETE);
 }
 
-TESTING_TEST (trust_create_assertion_for_untrusted_no_serial)
+TESTING_TEST (trust_create_assertion_for_distrusted_no_serial)
 {
 	CK_OBJECT_CLASS klass = CKO_X_TRUST_ASSERTION;
-	CK_X_ASSERTION_TYPE atype = CKT_X_UNTRUSTED_CERTIFICATE;
+	CK_X_ASSERTION_TYPE atype = CKT_X_DISTRUSTED_CERTIFICATE;
 	CK_OBJECT_HANDLE object = 0;
 	CK_RV rv;
 
@@ -460,7 +460,7 @@ TESTING_TEST (trust_create_assertion_for_untrusted_no_serial)
 TESTING_TEST (trust_create_assertion_twice)
 {
 	CK_OBJECT_CLASS klass = CKO_X_TRUST_ASSERTION;
-	CK_X_ASSERTION_TYPE atype = CKT_X_UNTRUSTED_CERTIFICATE;
+	CK_X_ASSERTION_TYPE atype = CKT_X_DISTRUSTED_CERTIFICATE;
 	CK_OBJECT_HANDLE object_1 = 0;
 	CK_OBJECT_HANDLE object_2 = 0;
 	CK_RV rv;
@@ -490,10 +490,10 @@ TESTING_TEST (trust_create_assertion_twice)
 	gkm_assert_cmprv (rv, ==, CKR_OBJECT_HANDLE_INVALID);
 }
 
-TESTING_TEST (trust_untrusted_assertion_has_no_cert_value)
+TESTING_TEST (trust_distrusted_assertion_has_no_cert_value)
 {
 	CK_OBJECT_CLASS klass = CKO_X_TRUST_ASSERTION;
-	CK_X_ASSERTION_TYPE atype = CKT_X_UNTRUSTED_CERTIFICATE;
+	CK_X_ASSERTION_TYPE atype = CKT_X_DISTRUSTED_CERTIFICATE;
 	CK_OBJECT_HANDLE object = 0;
 	CK_ATTRIBUTE check;
 	CK_RV rv;
@@ -506,7 +506,7 @@ TESTING_TEST (trust_untrusted_assertion_has_no_cert_value)
 		{ CKA_ISSUER, (void*)DER_ISSUER, XL (DER_ISSUER) }
 	};
 
-	/* Created as untrusted, should have no CKA_X_CERTIFICATE_VALUE */
+	/* Created as distrusted, should have no CKA_X_CERTIFICATE_VALUE */
 
 	rv = gkm_session_C_CreateObject (session, attrs, G_N_ELEMENTS (attrs), &object);
 	gkm_assert_cmprv (rv, ==, CKR_OK);
@@ -726,7 +726,7 @@ TESTING_TEST (trust_netscape_map_server_auth)
 	                          CKA_TRUST_SERVER_AUTH, CKT_NETSCAPE_TRUSTED);
 	assert_positive_netscape (CKT_X_ANCHORED_CERTIFICATE, "1.3.6.1.5.5.7.3.1",
 	                          CKA_TRUST_SERVER_AUTH, CKT_NETSCAPE_TRUSTED_DELEGATOR);
-	assert_negative_netscape (CKT_X_UNTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.1",
+	assert_negative_netscape (CKT_X_DISTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.1",
 	                          CKA_TRUST_SERVER_AUTH, CKT_NETSCAPE_UNTRUSTED);
 }
 
@@ -736,7 +736,7 @@ TESTING_TEST (trust_netscape_map_client_auth)
 	                          CKA_TRUST_CLIENT_AUTH, CKT_NETSCAPE_TRUSTED);
 	assert_positive_netscape (CKT_X_ANCHORED_CERTIFICATE, "1.3.6.1.5.5.7.3.2",
 	                          CKA_TRUST_CLIENT_AUTH, CKT_NETSCAPE_TRUSTED_DELEGATOR);
-	assert_negative_netscape (CKT_X_UNTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.2",
+	assert_negative_netscape (CKT_X_DISTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.2",
 	                          CKA_TRUST_CLIENT_AUTH, CKT_NETSCAPE_UNTRUSTED);
 }
 
@@ -746,7 +746,7 @@ TESTING_TEST (trust_netscape_map_code_signing)
 	                          CKA_TRUST_CODE_SIGNING, CKT_NETSCAPE_TRUSTED);
 	assert_positive_netscape (CKT_X_ANCHORED_CERTIFICATE, "1.3.6.1.5.5.7.3.3",
 	                          CKA_TRUST_CODE_SIGNING, CKT_NETSCAPE_TRUSTED_DELEGATOR);
-	assert_negative_netscape (CKT_X_UNTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.3",
+	assert_negative_netscape (CKT_X_DISTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.3",
 	                          CKA_TRUST_CODE_SIGNING, CKT_NETSCAPE_UNTRUSTED);
 }
 
@@ -756,7 +756,7 @@ TESTING_TEST (trust_netscape_map_email)
 	                          CKA_TRUST_EMAIL_PROTECTION, CKT_NETSCAPE_TRUSTED);
 	assert_positive_netscape (CKT_X_ANCHORED_CERTIFICATE, "1.3.6.1.5.5.7.3.4",
 	                          CKA_TRUST_EMAIL_PROTECTION, CKT_NETSCAPE_TRUSTED_DELEGATOR);
-	assert_negative_netscape (CKT_X_UNTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.4",
+	assert_negative_netscape (CKT_X_DISTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.4",
 	                          CKA_TRUST_EMAIL_PROTECTION, CKT_NETSCAPE_UNTRUSTED);
 }
 
@@ -766,7 +766,7 @@ TESTING_TEST (trust_netscape_map_ipsec_endpoint)
 	                          CKA_TRUST_IPSEC_END_SYSTEM, CKT_NETSCAPE_TRUSTED);
 	assert_positive_netscape (CKT_X_ANCHORED_CERTIFICATE, "1.3.6.1.5.5.7.3.5",
 	                          CKA_TRUST_IPSEC_END_SYSTEM, CKT_NETSCAPE_TRUSTED_DELEGATOR);
-	assert_negative_netscape (CKT_X_UNTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.5",
+	assert_negative_netscape (CKT_X_DISTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.5",
 	                          CKA_TRUST_IPSEC_END_SYSTEM, CKT_NETSCAPE_UNTRUSTED);
 }
 
@@ -776,7 +776,7 @@ TESTING_TEST (trust_netscape_map_ipsec_tunnel)
 	                          CKA_TRUST_IPSEC_TUNNEL, CKT_NETSCAPE_TRUSTED);
 	assert_positive_netscape (CKT_X_ANCHORED_CERTIFICATE, "1.3.6.1.5.5.7.3.6",
 	                          CKA_TRUST_IPSEC_TUNNEL, CKT_NETSCAPE_TRUSTED_DELEGATOR);
-	assert_negative_netscape (CKT_X_UNTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.6",
+	assert_negative_netscape (CKT_X_DISTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.6",
 	                          CKA_TRUST_IPSEC_TUNNEL, CKT_NETSCAPE_UNTRUSTED);
 }
 
@@ -786,7 +786,7 @@ TESTING_TEST (trust_netscape_map_ipsec_user)
 	                          CKA_TRUST_IPSEC_USER, CKT_NETSCAPE_TRUSTED);
 	assert_positive_netscape (CKT_X_ANCHORED_CERTIFICATE, "1.3.6.1.5.5.7.3.7",
 	                          CKA_TRUST_IPSEC_USER, CKT_NETSCAPE_TRUSTED_DELEGATOR);
-	assert_negative_netscape (CKT_X_UNTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.7",
+	assert_negative_netscape (CKT_X_DISTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.7",
 	                          CKA_TRUST_IPSEC_USER, CKT_NETSCAPE_UNTRUSTED);
 }
 
@@ -796,6 +796,6 @@ TESTING_TEST (trust_netscape_map_time_stamping)
 	                          CKA_TRUST_TIME_STAMPING, CKT_NETSCAPE_TRUSTED);
 	assert_positive_netscape (CKT_X_ANCHORED_CERTIFICATE, "1.3.6.1.5.5.7.3.8",
 	                          CKA_TRUST_TIME_STAMPING, CKT_NETSCAPE_TRUSTED_DELEGATOR);
-	assert_negative_netscape (CKT_X_UNTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.8",
+	assert_negative_netscape (CKT_X_DISTRUSTED_CERTIFICATE, "1.3.6.1.5.5.7.3.8",
 	                          CKA_TRUST_TIME_STAMPING, CKT_NETSCAPE_UNTRUSTED);
 }
diff --git a/tool/gkr-tool-trust.c b/tool/gkr-tool-trust.c
index 967a3c1..a407d33 100644
--- a/tool/gkr-tool-trust.c
+++ b/tool/gkr-tool-trust.c
@@ -119,8 +119,8 @@ get_pinned_certificate (GcrCertificate *certificate, GcrPurpose purpose)
 		g_print ("%s: no trust exception\n", string);
 	else if (trust == GCR_TRUST_TRUSTED)
 		g_print ("%s: certificate is explicitly trusted\n", string);
-	else if (trust == GCR_TRUST_UNTRUSTED)
-		g_print ("%s: certificate is explicitly untrusted\n", string);
+	else if (trust == GCR_TRUST_DISTRUSTED)
+		g_print ("%s: certificate is explicitly distrusted\n", string);
 
 	return 0;
 }
@@ -142,8 +142,8 @@ set_certificate_exception (GcrCertificate *certificate, GcrPurpose purpose, GcrT
 			g_print ("%s: no trust exception\n", string);
 		else if (trust == GCR_TRUST_TRUSTED)
 			g_print ("%s: certificate is explicitly trusted\n", string);
-		else if (trust == GCR_TRUST_UNTRUSTED)
-			g_print ("%s: certificate is explicitly untrusted\n", string);
+		else if (trust == GCR_TRUST_DISTRUSTED)
+			g_print ("%s: certificate is explicitly distrusted\n", string);
 	}
 
 	return 0;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]