diff options
| author | Stef Walter <stefw@gnome.org> | 2013-01-24 11:34:47 +0100 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2013-02-05 14:54:46 +0100 |
| commit | 5147d71466455b3d087b3f3a7472a35e8216c55a (patch) | |
| tree | 4b81eee35b7d0ec877a34c4fde06478d700a3960 /p11-kit | |
| parent | 603c7d4eb996f51178ccc9d235597497bbb2c7a4 (diff) | |
Add basic trust module
This is based off the roots-store from gnome-keyring and loads
certificates from a root directory and exposes them as PKCS#11
objects.
Diffstat (limited to 'p11-kit')
| -rw-r--r-- | p11-kit/Makefile.am | 1 | ||||
| -rw-r--r-- | p11-kit/conf.c | 37 | ||||
| -rw-r--r-- | p11-kit/p11-kit-1.pc.in | 3 |
3 files changed, 4 insertions, 37 deletions
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am index fd0b90a..650fe44 100644 --- a/p11-kit/Makefile.am +++ b/p11-kit/Makefile.am @@ -24,6 +24,7 @@ MODULE_SRCS = \ modules.c \ pkcs11.h \ pin.c \ + pkcs11.h \ proxy.c \ private.h \ messages.c \ diff --git a/p11-kit/conf.c b/p11-kit/conf.c index 68b6343..0f98636 100644 --- a/p11-kit/conf.c +++ b/p11-kit/conf.c @@ -111,43 +111,6 @@ strequal (const char *one, const char *two) return strcmp (one, two) == 0; } -static char * -strconcat (const char *first, - ...) GNUC_NULL_TERMINATED; - -static char * -strconcat (const char *first, - ...) -{ - size_t length = 0; - const char *arg; - char *result, *at; - va_list va; - - va_start (va, first); - - for (arg = first; arg; arg = va_arg (va, const char*)) - length += strlen (arg); - - va_end (va); - - at = result = malloc (length + 1); - return_val_if_fail (result != NULL, NULL); - - va_start (va, first); - - for (arg = first; arg; arg = va_arg (va, const char*)) { - length = strlen (arg); - memcpy (at, arg, length); - at += length; - } - - va_end (va); - - *at = 0; - return result; -} - /* ----------------------------------------------------------------------------- * CONFIG PARSER */ diff --git a/p11-kit/p11-kit-1.pc.in b/p11-kit/p11-kit-1.pc.in index d0d378d..441904d 100644 --- a/p11-kit/p11-kit-1.pc.in +++ b/p11-kit/p11-kit-1.pc.in @@ -10,6 +10,9 @@ p11_module_configs=@p11_package_config_modules@ p11_module_path=@p11_module_path@ proxy_module=@libdir@/p11-kit-proxy.so +p11_system_anchors=@with_system_anchors@ +p11_system_certificates=@with_system_certificates@ + # This is for compatibility. Other packages were using this to determine # the directory they should install their module configs to, so override # this and redirect them to the new location |