Fix CVE-2017-6891 in minitasn1 code

[platform/upstream/gnutls.git] / src / certtool-args.def

diff --git a/src/certtool-args.def b/src/certtool-args.def
index 903830e..ffef51c 100644 (file)
--- a/src/certtool-args.def
+++ b/src/certtool-args.def
@@ -4,7 +4,11 @@ prog-title    = "GnuTLS certificate tool";
 prog-desc     = "Manipulate certificates and private keys.";
 detail    = "Tool to parse and generate X.509 certificates, requests and private keys.
 It can be used interactively or non interactively by
-specifying the template command line option.";
+specifying the template command line option.
+
+The tool accepts files or URLs supported by GnuTLS. In case PIN is required for the URL
+access you can provide it using the environment variables GNUTLS_PIN and GNUTLS_SO_PIN.
+";
 short-usage   = "certtool [options]\ncerttool --help for usage instructions.\n";
 explain       = "";
 
@@ -119,14 +123,14 @@ flag = {
     name      = load-request;
     descrip   = "Loads a certificate request file";
     arg-type  = string;
-    doc = "";
+    doc = "This option can be used with a file";
 };
 
 flag = {
     name      = load-certificate;
     descrip   = "Loads a certificate file";
     arg-type  = string;
-    doc = "This can be either a file or a PKCS #11 URL";
+    doc = "This option can be used with a file";
 };
 
 flag = {
@@ -140,7 +144,7 @@ flag = {
     name      = load-ca-certificate;
     descrip   = "Loads the certificate authority's certificate file";
     arg-type  = string;
-    doc = "This can be either a file or a PKCS #11 URL";
+    doc = "This option can be used with a file";
 };
 
 flag = {
@@ -356,6 +360,13 @@ flag = {
 };
 
 flag = {
+    name      = curve;
+    arg-type  = string;
+    descrip   = "Specify the curve used for EC key generation";
+    doc      = "Supported values are secp192r1, secp224r1, secp256r1, secp384r1 and secp521r1.";
+};
+
+flag = {
     name      = sec-param;
     arg-type  = string;
     arg-name  = "Security parameter";
@@ -650,6 +661,12 @@ challenge_password = 123456
 # Whether this is a CA certificate or not
 #ca
 
+# Subject Unique ID (in hex)
+#subject_unique_id = 00153224
+
+# Issuer Unique ID (in hex)
+#issuer_unique_id = 00153225
+
 # for microsoft smart card logon
 # key_purpose_oid = 1.3.6.1.4.1.311.20.2.2