p11-kit: New priority option and change trust-policy option

 * Sort loaded modules appropriately using the 'priority' option. This
   allows us to have a predictable order for callers, when callers
   iterate through modules.
 * Modules default to having an 'priority' option of '0'.
 * If modules have the same order value, then sort by name.
 * The above assumes the role of ordering trust-policy sources.
 * Change the trust-policy option to a boolean
 * Some of this code will be rearranged when the managed branch
   is merged.

https://bugs.freedesktop.org/show_bug.cgi?id=61978

1 files changed, 11 insertions, 3 deletions

diff --git a/trust/p11-kit-trust.module b/trust/p11-kit-trust.module
index 1a6e94b..a55932a 100644
--- a/trust/p11-kit-trust.module
+++ b/trust/p11-kit-trust.module
@@ -1,9 +1,17 @@
+# See pkcs11.conf(5) to understand this file
 
 # This is a module config for the 'included' p11-kit trust module
 module: p11-kit-trust.so
 
-# The order in which this is loaded in the trust policy
-trust-policy: 1
+# This setting affects the order that trust policy and other information
+# is looked up when going across various modules. Other trust policy modules
+# need to specify the priority where they slot into things.
+priority: 1
 
-# This is for drop-in compatibilty with glib-networking and gcr
+# Mark this module as a viable source of trust policy information
+trust-policy: yes
+
+# This is for drop-in compatibilty with glib-networking and gcr. Those
+# projects used this non-standard attribute to denote slots to use to
+# retrieve trust information.
 x-trust-lookup: pkcs11:library-description=PKCS%2311%20Kit%20Trust%20Module