diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2014-12-11 13:03:35 +0000 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2014-12-27 15:09:36 +0100 |
| commit | 3c6d32205db88348c07c720b710b41548497819c (patch) | |
| tree | a77ee4e060e6dccbfb046b6bceb17cfb3e4ee156 /doc | |
| parent | e2e9a69c1ecc7142cc17d665076795215b6a8e9a (diff) | |
| download | openvpn-3c6d32205db88348c07c720b710b41548497819c.tar.gz openvpn-3c6d32205db88348c07c720b710b41548497819c.tar.xz openvpn-3c6d32205db88348c07c720b710b41548497819c.zip | |
pkcs11: Load p11-kit-proxy.so module by default
If the user specifies --pkcs11-id or --pkcs-id-management but neglects
to explicitly provide a --pkcs11-provider argument, and if the system
has p11-kit installed, then load the p11-kit proxy module so that the
system-configured tokens are available.
Trac: 490
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <1418303015.31745.78.camel@infradead.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9342
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 6f1d3cf062d5c33cbad4d521d157d43d53ffc7d1)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/openvpn.8 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/openvpn.8 b/doc/openvpn.8 index 532eda5..0bdea1f 100644 --- a/doc/openvpn.8 +++ b/doc/openvpn.8 @@ -4393,6 +4393,16 @@ This option can be used instead of .B \-\-cert, \-\-key, and .B \-\-pkcs12. + +If p11-kit is present on the system, its +.B p11-kit-proxy.so +module will be loaded by default if either the +.B \-\-pkcs11\-id +or +.B \-\-pkcs11\-id\-management +options are specified without +.B \-\-pkcs11\-provider +being given. .\"********************************************************* .TP .B \-\-pkcs11-private-mode mode... |