From 0e75a5ba8261955d4d75a38a528f79ff4edd5c21 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Wed, 6 Mar 2013 19:16:09 +0100 Subject: trust: Make each configured path its own token * Each source directory or file configured into the module or passed in as an initialization argument becomes its own token. Previously there was one token that contained certificates from all the configured paths. * These tokens are clearly labeled in the token info as to the directory or file that they represent. * Update PKCS#11 module logic to deal with multiple tokens, validate the slot ids and so on. * The order in which the paths are configured will become the order of trust priority. This is the same order in which they are listed through 'p11-kit list-modules' and C_GetSlotList. * Update the frob-token internal tool to only play with one path * Adjust tests where necessary to reflect the new state of things and add tests for modified trust module code https://bugs.freedesktop.org/show_bug.cgi?id=61499 --- trust/tests/test-session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'trust/tests/test-session.c') diff --git a/trust/tests/test-session.c b/trust/tests/test-session.c index e9031f2..6183e7c 100644 --- a/trust/tests/test-session.c +++ b/trust/tests/test-session.c @@ -53,7 +53,7 @@ struct { static void setup (CuTest *cu) { - test.token = p11_token_new (""); + test.token = p11_token_new (1, "/nonexistant"); CuAssertPtrNotNull (cu, test.token); test.session = p11_session_new (test.token); -- cgit v1.1