summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2014-02-13 09:09:50 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2014-02-13 09:43:49 +0100
commit80bdbbe0dc9738a734af20bab2fb6a95b97c376e (patch)
tree3194c572f1247691bce2a40d12195d641107fb74
parent1de0e8bda6e785eef66d7b86512820b705953e21 (diff)
downloadgnutls-80bdbbe0dc9738a734af20bab2fb6a95b97c376e.tar.gz
mark trusted p11-kit modules as trusted.
Conflicts: lib/pkcs11.c
-rw-r--r--lib/pkcs11.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index af953c6c66..857f16a927 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -44,6 +44,8 @@
struct gnutls_pkcs11_provider_s {
struct ck_function_list *module;
+ unsigned trusted; /* in the sense of p11-kit trusted:
+ * it can be used for verification */
struct ck_info info;
unsigned int initialized;
};
@@ -220,6 +222,9 @@ pkcs11_add_module(const char *name, struct ck_function_list *module)
active_providers++;
providers[active_providers - 1].module = module;
+ if (p11_kit_module_get_flags(module) & P11_KIT_MODULE_TRUSTED)
+ providers[active_providers - 1].trusted = 1;
+
memcpy(&providers[active_providers - 1].info, &info, sizeof(info));
_gnutls_debug_log("p11: loaded provider '%s'\n", name);