summaryrefslogtreecommitdiff
path: root/src/p11tool.c
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-05-10 16:40:10 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-05-10 17:20:58 +0200
commit8692f797eb887ca7d88e9b5bc4e59bc5b10ce358 (patch)
tree7a4ec085594f5e9913613e8cde7802b4bddd7b1a /src/p11tool.c
parente1cc9a37e17fdadc6ce133caa6384a3df778529a (diff)
downloadgnutls-8692f797eb887ca7d88e9b5bc4e59bc5b10ce358.tar.gz
p11tool: added the --provider-opts option
This option allows passing parameters to the PKCS#11 module loading process, i.e., passed to gnutls_pkcs11_add_provider(). Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'src/p11tool.c')
-rw-r--r--src/p11tool.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/p11tool.c b/src/p11tool.c
index 7bb7164cba..6b9718e374 100644
--- a/src/p11tool.c
+++ b/src/p11tool.c
@@ -164,6 +164,11 @@ static void cmd_parser(int argc, char **argv)
}
if (HAVE_OPT(PROVIDER)) {
+ const char *params = NULL;
+
+ if (HAVE_OPT(PROVIDER_OPTS))
+ params = OPT_ARG(PROVIDER_OPTS);
+
ret = gnutls_pkcs11_init(GNUTLS_PKCS11_FLAG_MANUAL, NULL);
if (ret < 0)
fprintf(stderr, "pkcs11_init: %s\n",
@@ -171,7 +176,7 @@ static void cmd_parser(int argc, char **argv)
else {
ret =
gnutls_pkcs11_add_provider(OPT_ARG(PROVIDER),
- NULL);
+ params);
if (ret < 0) {
fprintf(stderr, "pkcs11_add_provider: %s\n",
gnutls_strerror(ret));