diff options
| -rw-r--r-- | p11-kit/modules.c | 46 | ||||
| -rw-r--r-- | p11-kit/p11-kit.h | 5 | ||||
| -rw-r--r-- | p11-kit/test-transport.c | 13 |
3 files changed, 59 insertions, 5 deletions
diff --git a/p11-kit/modules.c b/p11-kit/modules.c index 3b2a949..fb99e31 100644 --- a/p11-kit/modules.c +++ b/p11-kit/modules.c @@ -1,6 +1,7 @@ /* * Copyright (C) 2008 Stefan Walter * Copyright (C) 2011 Collabora Ltd. + * Copyright (C) 2017 Red Hat, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -185,6 +186,51 @@ const char *p11_config_user_modules = P11_USER_CONFIG_MODULES; * P11-KIT FUNCTIONALITY */ +/** + * p11_kit_override_system_files: + * @system_conf: the system configuration file (default: system_config_dir/pkcs11.conf) + * @user_conf: the user configuration file (default: ~/.config/pkcs11/pkcs11.conf) + * @package_modules: location of modules shipped by p11-kit (default: system_config/modules) + * @system_modules: location of system pkcs11 modules (default: system_config/modules) + * @user_modules: location of user modules (default: ~/.config/pkcs11/modules) + * + * Overrides the default system configuration files. The + * provided values should be accessible for the lifetime + * of p11-kit usage. + * + * When the value %NULL is provided for any of the locations, + * it will not be updated. + * + * This is function intended to be used in test suites and + * not production, and as such %P11_KIT_FUTURE_UNSTABLE_API + * must be defined before including p11-kit.h. + * + * Since: 0.23.10 + * + */ +void +p11_kit_override_system_files (const char *system_conf, + const char *user_conf, + const char *package_modules, + const char *system_modules, + const char *user_modules) +{ + if (system_conf) + p11_config_system_file = system_conf; + + if (user_conf) + p11_config_user_file = user_conf; + + if (package_modules) + p11_config_package_modules = package_modules; + + if (system_modules) + p11_config_system_modules = system_modules; + + if (user_modules) + p11_config_user_modules = user_modules; +} + static CK_RV create_mutex (CK_VOID_PTR_PTR mut) { diff --git a/p11-kit/p11-kit.h b/p11-kit/p11-kit.h index a266c35..2a3a740 100644 --- a/p11-kit/p11-kit.h +++ b/p11-kit/p11-kit.h @@ -111,6 +111,11 @@ void p11_kit_be_loud (void); void p11_kit_set_progname (const char *progname); +void p11_kit_override_system_files (const char *system_conf, + const char *user_conf, + const char *package_modules, + const char *system_modules, + const char *user_modules); #endif const char * p11_kit_message (void); diff --git a/p11-kit/test-transport.c b/p11-kit/test-transport.c index f9c1954..1a9f603 100644 --- a/p11-kit/test-transport.c +++ b/p11-kit/test-transport.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2012 Stefan Walter - * Copyright (c) 2012 Red Hat Inc. + * Copyright (c) 2012-2017 Red Hat Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -40,6 +40,7 @@ #include "mock.h" #include "path.h" #include "private.h" + #include "p11-kit.h" #include "rpc.h" @@ -87,8 +88,9 @@ setup_remote (void *unused) data = "remote: |" BUILDDIR "/p11-kit/p11-kit" EXEEXT " remote " BUILDDIR "/.libs/mock-five" SHLEXT "\nx-init-reserved: initialize-arg"; p11_test_file_write (test.user_modules, "init-arg.module", data, strlen (data)); - p11_config_user_modules = test.user_modules; - p11_config_user_file = test.user_config; + p11_kit_override_system_files (NULL, test.user_config, + NULL, NULL, + test.user_modules); } static void @@ -239,8 +241,9 @@ setup_remote_unix (void *unused) p11_test_file_write (test.user_modules, "remote.module", data, strlen (data)); free (data); - p11_config_user_modules = test.user_modules; - p11_config_user_file = test.user_config; + p11_kit_override_system_files (NULL, test.user_config, + NULL, NULL, + test.user_modules); } static void |