From 64170349a4f8beb122d2354f9210186ba065f87b Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 25 Jun 2013 16:37:41 +0200 Subject: [PATCH] trust: Use NSS's name for default trust token Several NSS using applications check the token label for the default builtin certificates before using trust from that store. Sicne p11-kit-trust.so is supposed to (also) be a drop in replacement for libnssckbi.so, use the same token name. NSS likes tokens to have unique labels. However this is a replacement for the libnssckbi.so tokens, and thus using the same token and certificate labels is not a surprise. https://bugs.freedesktop.org/show_bug.cgi?id=66161 --- trust/module.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/trust/module.c b/trust/module.c index ba41884..de962b6 100644 --- a/trust/module.c +++ b/trust/module.c @@ -175,13 +175,17 @@ create_tokens_inlock (p11_array *tokens, * unfortunately cannot be marked translatable. If localization is * desired they should be translated in GUI applications. These * strings will not change arbitrarily. + * + * The first string "Builtin Object Token" is the same as the token + * string for libnssckbi.so from NSS. This is because several NSS + * using applications check the token name for certain usages. */ struct { const char *prefix; const char *label; } labels[] = { - { DATADIR, "Default Trust" }, + { DATADIR, "Builtin Object Token" }, { SYSCONFDIR, "System Trust" }, { NULL }, }; -- 1.8.3.1