Commit 5d8326ea authored by Ray Strode's avatar Ray Strode Committed by Daiki Ueno

pkcs11: Don't install p11-kit module configuration

It doesn't work well in multithreaded environments, and it overlaps
with better maintained options like SoftHSM.  To avoid any confusion,
stop installing the p11-kit configuration for that module so that it
is not registered by default.

https://bugzilla.gnome.org/show_bug.cgi?id=791401
parent ff229abc
......@@ -146,9 +146,6 @@ depcomp
/pkcs11/gnome2-store/tests/check-gnome2-module
/pkcs11/gnome2-store/tests/check-module
/pkcs11/rpc-layer/gnome-keyring-module
/pkcs11/rpc-layer/gnome-keyring.module
/pkcs11/secret-store/tests/test-secret-binary
/pkcs11/secret-store/tests/test-secret-collection
/pkcs11/secret-store/tests/test-secret-compat
......
......@@ -638,7 +638,6 @@ AC_SUBST(P11_TESTS_LIBS)
AC_OUTPUT([
Makefile
pkcs11/rpc-layer/gnome-keyring.module
po/Makefile.in
])
......
......@@ -45,11 +45,6 @@ gnome_keyring_pkcs11_la_LDFLAGS = \
-module -avoid-version \
-no-undefined -export-symbols-regex 'C_GetFunctionList'
# This is the configuration file that p11-kit uses to load the module
pkcs11configdir = $(P11_SYSTEM_CONFIG_MODULES)
pkcs11config_DATA = \
pkcs11/rpc-layer/gnome-keyring.module
# -----------------------------------------------------------------------------
# The tests
......
# The file is installed/loaded from the default module p11-kit directory
module: gnome-keyring-pkcs11.so
# And where to store and lookup trust objects
x-trust-store: pkcs11:library-manufacturer=GNOME%20Keyring;serial=1:XDG:DEFAULT
x-trust-lookup: pkcs11:library-manufacturer=GNOME%20Keyring
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment