summaryrefslogtreecommitdiff
path: root/doc/invoke-p11tool.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/invoke-p11tool.texi')
-rw-r--r--doc/invoke-p11tool.texi20
1 files changed, 15 insertions, 5 deletions
diff --git a/doc/invoke-p11tool.texi b/doc/invoke-p11tool.texi
index 128df72896..2842f5c621 100644
--- a/doc/invoke-p11tool.texi
+++ b/doc/invoke-p11tool.texi
@@ -6,7 +6,7 @@
#
# DO NOT EDIT THIS FILE (invoke-p11tool.texi)
#
-# It has been AutoGen-ed December 16, 2013 at 01:40:37 PM by AutoGen 5.18
+# It has been AutoGen-ed January 24, 2014 at 07:12:22 PM by AutoGen 5.18.2
# From the definitions ../src/p11tool-args.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -117,7 +117,7 @@ Please send bug reports to: <bugs@@gnutls.org>
@subsubheading debug option (-d)
This is the ``enable debugging.'' option.
-This option takes an argument number.
+This option takes a number argument.
Specifies the debug level.
@anchor{p11tool write}
@subsubheading write option
@@ -148,7 +148,9 @@ This is the ``marks the object to be written as private'' option.
This option has some usage constraints. It:
@itemize @bullet
@item
-is enabled by default.
+can be disabled with --no-private.
+@item
+It is enabled by default.
@end itemize
The written object will require a PIN to be used.
@@ -156,12 +158,20 @@ The written object will require a PIN to be used.
@subsubheading sec-param option
This is the ``specify the security level'' option.
-This option takes an argument string @file{Security parameter}.
+This option takes a string argument @file{Security parameter}.
This is alternative to the bits option. Available options are [low, legacy, normal, high, ultra].
@anchor{p11tool inder}
@subsubheading inder option
This is the ``use der/raw format for input'' option.
+
+@noindent
+This option has some usage constraints. It:
+@itemize @bullet
+@item
+can be disabled with --no-inder.
+@end itemize
+
Use DER/RAW format for input certificates and private keys.
@anchor{p11tool inraw}
@subsubheading inraw option
@@ -173,7 +183,7 @@ This is an alias for the @code{inder} option,
@subsubheading provider option
This is the ``specify the pkcs #11 provider library'' option.
-This option takes an argument file.
+This option takes a file argument.
This will override the default options in /etc/gnutls/pkcs11.conf
@anchor{p11tool exit status}
@subsubheading p11tool exit status