trust: Support token directory paths in user's home directory

diff --git a/trust/module.c b/trust/module.c
index d2fcba688bd13773286d11eff26b05f5fdf69d6c..25a72b7b44be5c04d8a6f761316f5ec10b44fcdc 100644 (file)
--- a/trust/module.c
+++ b/trust/module.c
@@ -195,6 +195,7 @@ create_tokens_inlock (p11_array *tokens,
                const char *prefix;
                const char *label;
        } labels[] = {
+               { "~/", "User Trust" },
                { DATADIR, "Default Trust" },
                { SYSCONFDIR, "System Trust" },
                { NULL },

diff --git a/trust/token.c b/trust/token.c
index 77ff73995b5379209ac03bc8b39ca973b5f14ba2..ca24762c582a1735354a2c99e06c7ac3368adf9c 100644 (file)
--- a/trust/token.c
+++ b/trust/token.c
@@ -643,7 +643,7 @@ p11_token_new (CK_SLOT_ID slot,
        token->loaded = p11_dict_new (p11_dict_str_hash, p11_dict_str_equal, free, free);
        return_val_if_fail (token->loaded != NULL, NULL);
 
-       token->path = strdup (path);
+       token->path = p11_path_expand (path);
        return_val_if_fail (token->path != NULL, NULL);
 
        token->anchors = p11_path_build (token->path, "anchors", NULL);