diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-07-10 13:12:00 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-07-10 13:12:00 +0200 |
| commit | 218af254466c061e716e5a9a24592da58a6f2f54 (patch) | |
| tree | 392d4adcc697410c81ad9b3186d860893e5d5e10 /src | |
| parent | c460370cd8079ef2a6a9787c023a5a2cd1d70853 (diff) | |
| download | gnutls-218af254466c061e716e5a9a24592da58a6f2f54.tar.gz | |
p11tool: less verbose output in --list-tokens unless --verbose is specified
Diffstat (limited to 'src')
| -rw-r--r-- | src/p11tool-args.def | 1 | ||||
| -rw-r--r-- | src/p11tool.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/p11tool-args.def b/src/p11tool-args.def index 94ccbced29..0fd7e18ac2 100644 --- a/src/p11tool-args.def +++ b/src/p11tool-args.def @@ -20,6 +20,7 @@ reorder-args; argument = "[url]"; #define OUTFILE_OPT 1 +#define VERBOSE_OPT 1 #include args-std.def flag = { diff --git a/src/p11tool.c b/src/p11tool.c index a3442d8a35..397b4c09fa 100644 --- a/src/p11tool.c +++ b/src/p11tool.c @@ -178,6 +178,9 @@ static void cmd_parser(int argc, char **argv) flags = opt_to_flags(&key_usage); cinfo.key_usage = key_usage; + if (HAVE_OPT(VERBOSE)) + cinfo.verbose = 1; + if (HAVE_OPT(SECRET_KEY)) cinfo.secret_key = OPT_ARG(SECRET_KEY); @@ -240,7 +243,7 @@ static void cmd_parser(int argc, char **argv) /* handle actions */ if (HAVE_OPT(LIST_TOKENS)) { - pkcs11_token_list(outfile, detailed_url, &cinfo, 0); + pkcs11_token_list(outfile, detailed_url, &cinfo, !cinfo.verbose); } else if (HAVE_OPT(LIST_MECHANISMS)) { pkcs11_mechanism_list(outfile, url, flags, &cinfo); } else if (HAVE_OPT(GENERATE_RANDOM)) { |