From e19fe680c4e142b19d306e2da6b21dd7e42b3104 Mon Sep 17 00:00:00 2001 From: Mat Date: Tue, 15 Jan 2019 07:32:41 +0100 Subject: [PATCH] Add object type "secrkey" to help of --type switch in pkcs11-tool (#1575) * Add object type "secrkey" to help of --type switch in pkcs11-tool Reading an object with pkcs11-tool requires the `--type` switch. The help for that switch is currently incomplete as it is missing the (not very friendly named" *secrkey* option used to read out a secret key object. I have added this information to the help description. * Update man page Describe secrkey option of pkcs11-tool's --type switch in man page --- doc/tools/pkcs11-tool.1.xml | 5 +++-- src/tools/pkcs11-tool.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/tools/pkcs11-tool.1.xml b/doc/tools/pkcs11-tool.1.xml index c83aafd5..d85a1a5e 100644 --- a/doc/tools/pkcs11-tool.1.xml +++ b/doc/tools/pkcs11-tool.1.xml @@ -475,8 +475,9 @@ type Specify the type of object to operate on. - Examples are cert, privkey - and pubkey. + Valid value are cert, privkey, + pubkey, secrkey + and data. diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c index d60132c5..9af5ea6d 100644 --- a/src/tools/pkcs11-tool.c +++ b/src/tools/pkcs11-tool.c @@ -269,7 +269,7 @@ static const char *option_help[] = { "Specify the application ID of the data object (use with --type data)", "Specify the issuer in hexadecimal format (use with --type cert)", "Specify the subject in hexadecimal format (use with --type cert/privkey/pubkey)", - "Specify the type of object (e.g. cert, privkey, pubkey, data)", + "Specify the type of object (e.g. cert, privkey, pubkey, secrkey, data)", "Specify the ID of the object", "Specify the label of the object", "Specify the ID of the slot to use",