diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-10-31 10:37:23 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-10-31 10:39:35 +0100 |
| commit | db38404ff815e09b57c962e9e8083cd7ea3bd96b (patch) | |
| tree | c8a087382459cb00646e55b97fa06a8e3fc87277 | |
| parent | d8a42e6cca198b1db4cc8822fbea3ef54bfbe75c (diff) | |
| download | gnutls-db38404ff815e09b57c962e9e8083cd7ea3bd96b.tar.gz | |
corrected example
| -rw-r--r-- | doc/invoke-certtool.texi | 38 | ||||
| -rw-r--r-- | src/certtool-args.c | 1761 | ||||
| -rw-r--r-- | src/certtool-args.def | 4 | ||||
| -rw-r--r-- | src/certtool-args.h | 62 |
4 files changed, 545 insertions, 1320 deletions
diff --git a/doc/invoke-certtool.texi b/doc/invoke-certtool.texi index fd47ed0f82..54e7f82c9a 100644 --- a/doc/invoke-certtool.texi +++ b/doc/invoke-certtool.texi @@ -3,10 +3,10 @@ @pindex certtool @ignore # -*- buffer-read-only: t -*- vi: set ro: -# +# # DO NOT EDIT THIS FILE (invoke-certtool.texi) -# -# It has been AutoGen-ed May 5, 2013 at 03:51:56 PM by AutoGen 5.17.3 +# +# It has been AutoGen-ed October 31, 2013 at 10:38:26 AM by AutoGen 5.17 # From the definitions ../src/certtool-args.def # and the template file agtexi-cmd.tpl @end ignore @@ -37,8 +37,8 @@ with a status code of 0. @exampleindent 0 @example -certtool - GnuTLS certificate tool -Usage: certtool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... +certtool - GnuTLS certificate tool - Ver. @@VERSION@@ +USAGE: certtool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... -d, --debug=num Enable debugging. - it must be in the range: @@ -96,27 +96,29 @@ Usage: certtool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... --rsa Generate RSA key --dsa Generate DSA key --ecc Generate ECC (ECDSA) key - --ecdsa an alias for the 'ecc' option + --ecdsa This is an alias for 'ecc' --hash=str Hash algorithm to use for signing. --inder Use DER format for input certificates and private keys. - disabled as '--no-inder' - --inraw an alias for the 'inder' option + --inraw This is an alias for 'inder' --outder Use DER format for output certificates and private keys - disabled as '--no-outder' - --outraw an alias for the 'outder' option + --outraw This is an alias for 'outder' --bits=num Specify the number of bits for key generate --sec-param=str Specify the security level [low, legacy, normal, high, ultra]. --disable-quick-random No effect --template=file Template file to use for non-interactive operation - file must pre-exist --pkcs-cipher=str Cipher to use for PKCS #8 and #12 operations - -v, --version[=arg] output version information and exit - -h, --help display extended usage information and exit - -!, --more-help extended usage information passed thru pager + -v, --version[=arg] Output version information and exit + -h, --help Display extended usage information and exit + -!, --more-help Extended usage information passed thru pager Options are specified by doubled hyphens and their name or by a single hyphen and the flag character. + + 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. @@ -261,7 +263,7 @@ When combined with --generate-privkey generates an elliptic curve private key to @anchor{certtool ecdsa} @subsubheading ecdsa option -This is an alias for the @code{ecc} option, +This is an alias for the ecc option, @pxref{certtool ecc, the ecc option documentation}. @anchor{certtool hash} @@ -280,7 +282,7 @@ certificates), when reading in DER format a single data structure is read. @anchor{certtool inraw} @subsubheading inraw option -This is an alias for the @code{inder} option, +This is an alias for the inder option, @pxref{certtool inder, the inder option documentation}. @anchor{certtool outder} @@ -291,7 +293,7 @@ The output will be in DER or RAW format. @anchor{certtool outraw} @subsubheading outraw option -This is an alias for the @code{outder} option, +This is an alias for the outder option, @pxref{certtool outder, the outder option documentation}. @anchor{certtool sec-param} @@ -319,6 +321,7 @@ The operation failed or the command syntax was not valid. @anchor{certtool See Also} @subsubheading certtool See Also p11tool (1) + @anchor{certtool Examples} @subsubheading certtool Examples @subsubheading Generating private keys @@ -437,6 +440,7 @@ To verify a Certificate Revocation List (CRL) do: @example $ certtool --verify-crl --load-ca-certificate x509-ca.pem < crl.pem @end example + @anchor{certtool Files} @subsubheading certtool Files @subsubheading Certtool's template file format @@ -445,8 +449,8 @@ certtool. Initially create a file named 'cert.cfg' that contains the information about the certificate. The template can be used as below: @example -$ certtool --generate-certificate cert.pem --load-privkey key.pem \ - --template cert.cfg \ +$ certtool --generate-certificate --load-privkey key.pem \ + --template cert.cfg --outfile cert.pem \ --load-ca-certificate ca-cert.pem --load-ca-privkey ca-key.pem @end example @@ -620,3 +624,5 @@ encryption_key #crl_number = 5 @end example + + diff --git a/src/certtool-args.c b/src/certtool-args.c index 403e7becc8..300fa77505 100644 --- a/src/certtool-args.c +++ b/src/certtool-args.c @@ -1,12 +1,12 @@ /* -*- buffer-read-only: t -*- vi: set ro: - * + * * DO NOT EDIT THIS FILE (certtool-args.c) - * - * It has been AutoGen-ed May 5, 2013 at 12:48:28 PM by AutoGen 5.17.3 + * + * It has been AutoGen-ed October 31, 2013 at 10:37:31 AM by AutoGen 5.17 * From the definitions certtool-args.def * and the template file options * - * Generated from AutoOpts 38:0:13 templates. + * Generated from AutoOpts 37:0:12 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -21,19 +21,20 @@ * * Copyright (C) 2000-2012 Free Software Foundation, all rights reserved. * This is free software. It is licensed for use, modification and - * redistribution under the terms of the GNU General Public License, - * version 3 or later <http://gnu.org/licenses/gpl.html> + * redistribution under the terms of the + * GNU General Public License, version 3 or later + * <http://gnu.org/licenses/gpl.html> * * certtool is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * certtool is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -52,24 +53,28 @@ extern "C" { #endif extern FILE * option_usage_fp; + +/* TRANSLATORS: choose the translation for option names wisely because you + cannot ever change your mind. */ #define zCopyright (certtool_opt_strs+0) -#define zLicenseDescrip (certtool_opt_strs+275) +#define zLicenseDescrip (certtool_opt_strs+279) #ifndef NULL # define NULL 0 #endif -/** - * static const strings for certtool options +/* + * certtool option static const strings */ -static char const certtool_opt_strs[4863] = +static char const certtool_opt_strs[4877] = /* 0 */ "certtool @VERSION@\n" "Copyright (C) 2000-2012 Free Software Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" - "redistribution under the terms of the GNU General Public License,\n" - "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" -/* 275 */ "certtool is free software: you can redistribute it and/or modify it under\n" + "redistribution under the terms of the\n" + "GNU General Public License, version 3 or later\n" + " <http://gnu.org/licenses/gpl.html>\n\0" +/* 279 */ "certtool is free software: you can redistribute it and/or modify it under\n" "the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -79,936 +84,700 @@ static char const certtool_opt_strs[4863] = "details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see <http://www.gnu.org/licenses/>.\n\0" -/* 880 */ "Enable debugging.\0" -/* 898 */ "DEBUG\0" -/* 904 */ "debug\0" -/* 910 */ "More verbose output\0" -/* 930 */ "VERBOSE\0" -/* 938 */ "verbose\0" -/* 946 */ "Input file\0" -/* 957 */ "INFILE\0" -/* 964 */ "infile\0" -/* 971 */ "Output file\0" -/* 983 */ "OUTFILE\0" -/* 991 */ "outfile\0" -/* 999 */ "Generate a self-signed certificate\0" -/* 1034 */ "GENERATE_SELF_SIGNED\0" -/* 1055 */ "generate-self-signed\0" -/* 1076 */ "Generate a signed certificate\0" -/* 1106 */ "GENERATE_CERTIFICATE\0" -/* 1127 */ "generate-certificate\0" -/* 1148 */ "Generates a proxy certificate\0" -/* 1178 */ "GENERATE_PROXY\0" -/* 1193 */ "generate-proxy\0" -/* 1208 */ "Generate a CRL\0" -/* 1223 */ "GENERATE_CRL\0" -/* 1236 */ "generate-crl\0" -/* 1249 */ "Update a signed certificate\0" -/* 1277 */ "UPDATE_CERTIFICATE\0" -/* 1296 */ "update-certificate\0" -/* 1315 */ "Generate a private key\0" -/* 1338 */ "GENERATE_PRIVKEY\0" -/* 1355 */ "generate-privkey\0" -/* 1372 */ "Generate a PKCS #10 certificate request\0" -/* 1412 */ "GENERATE_REQUEST\0" -/* 1429 */ "generate-request\0" -/* 1446 */ "Verify a PEM encoded certificate chain.\0" -/* 1486 */ "VERIFY_CHAIN\0" -/* 1499 */ "verify-chain\0" -/* 1512 */ "Verify a PEM encoded certificate chain using a trusted list.\0" -/* 1573 */ "VERIFY\0" -/* 1580 */ "verify\0" -/* 1587 */ "Verify a CRL using a trusted list.\0" -/* 1622 */ "VERIFY_CRL\0" -/* 1633 */ "verify-crl\0" -/* 1644 */ "Generate PKCS #3 encoded Diffie-Hellman parameters.\0" -/* 1696 */ "GENERATE_DH_PARAMS\0" -/* 1715 */ "generate-dh-params\0" -/* 1734 */ "Get the included PKCS #3 encoded Diffie-Hellman parameters.\0" -/* 1794 */ "GET_DH_PARAMS\0" -/* 1808 */ "get-dh-params\0" -/* 1822 */ "Print information PKCS #3 encoded Diffie-Hellman parameters\0" -/* 1882 */ "DH_INFO\0" -/* 1890 */ "dh-info\0" -/* 1898 */ "Loads a private key file\0" -/* 1923 */ "LOAD_PRIVKEY\0" -/* 1936 */ "load-privkey\0" -/* 1949 */ "Loads a public key file\0" -/* 1973 */ "LOAD_PUBKEY\0" -/* 1985 */ "load-pubkey\0" -/* 1997 */ "Loads a certificate request file\0" -/* 2030 */ "LOAD_REQUEST\0" -/* 2043 */ "load-request\0" -/* 2056 */ "Loads a certificate file\0" -/* 2081 */ "LOAD_CERTIFICATE\0" -/* 2098 */ "load-certificate\0" -/* 2115 */ "Loads the certificate authority's private key file\0" -/* 2166 */ "LOAD_CA_PRIVKEY\0" -/* 2182 */ "load-ca-privkey\0" -/* 2198 */ "Loads the certificate authority's certificate file\0" -/* 2249 */ "LOAD_CA_CERTIFICATE\0" -/* 2269 */ "load-ca-certificate\0" -/* 2289 */ "Password to use\0" -/* 2305 */ "PASSWORD\0" -/* 2314 */ "password\0" -/* 2323 */ "Print big number in an easier format to parse\0" -/* 2369 */ "HEX_NUMBERS\0" -/* 2381 */ "hex-numbers\0" -/* 2393 */ "In certain operations it prints the information is C-friendly format\0" -/* 2462 */ "CPRINT\0" -/* 2469 */ "cprint\0" -/* 2476 */ "Enforce a NULL password\0" -/* 2500 */ "NULL_PASSWORD\0" -/* 2514 */ "null-password\0" -/* 2528 */ "Print information on the given certificate\0" -/* 2571 */ "CERTIFICATE_INFO\0" -/* 2588 */ "certificate-info\0" -/* 2605 */ "Print certificate's public key\0" -/* 2636 */ "CERTIFICATE_PUBKEY\0" -/* 2655 */ "certificate-pubkey\0" -/* 2674 */ "Print information on the given OpenPGP certificate\0" -/* 2725 */ "PGP_CERTIFICATE_INFO\0" -/* 2746 */ "pgp-certificate-info\0" -/* 2767 */ "Print information on the given OpenPGP keyring structure\0" -/* 2824 */ "PGP_RING_INFO\0" -/* 2838 */ "pgp-ring-info\0" -/* 2852 */ "Print information on the given CRL structure\0" -/* 2897 */ "CRL_INFO\0" -/* 2906 */ "crl-info\0" -/* 2915 */ "Print information on the given certificate request\0" -/* 2966 */ "CRQ_INFO\0" -/* 2975 */ "crq-info\0" -/* 2984 */ "Do not use extensions in certificate requests\0" -/* 3030 */ "NO_CRQ_EXTENSIONS\0" -/* 3048 */ "no-crq-extensions\0" -/* 3066 */ "Print information on a PKCS #12 structure\0" -/* 3108 */ "P12_INFO\0" -/* 3117 */ "p12-info\0" -/* 3126 */ "Print information on a PKCS #7 structure\0" -/* 3167 */ "P7_INFO\0" -/* 3175 */ "p7-info\0" -/* 3183 */ "Convert S/MIME to PKCS #7 structure\0" -/* 3219 */ "SMIME_TO_P7\0" -/* 3231 */ "smime-to-p7\0" -/* 3243 */ "Print information on a private key\0" -/* 3278 */ "KEY_INFO\0" -/* 3287 */ "key-info\0" -/* 3296 */ "Print information on an OpenPGP private key\0" -/* 3340 */ "PGP_KEY_INFO\0" -/* 3353 */ "pgp-key-info\0" -/* 3366 */ "Print information on a public key\0" -/* 3400 */ "PUBKEY_INFO\0" -/* 3412 */ "pubkey-info\0" -/* 3424 */ "Generate an X.509 version 1 certificate (with no extensions)\0" -/* 3485 */ "V1\0" -/* 3488 */ "v1\0" -/* 3491 */ "Generate a PKCS #12 structure\0" -/* 3521 */ "TO_P12\0" -/* 3528 */ "to-p12\0" -/* 3535 */ "Generate a PKCS #8 structure\0" -/* 3564 */ "TO_P8\0" -/* 3570 */ "to-p8\0" -/* 3576 */ "Use PKCS #8 format for private keys\0" -/* 3612 */ "PKCS8\0" -/* 3618 */ "pkcs8\0" -/* 3624 */ "Generate RSA key\0" -/* 3641 */ "RSA\0" -/* 3645 */ "rsa\0" -/* 3649 */ "Generate DSA key\0" -/* 3666 */ "DSA\0" -/* 3670 */ "dsa\0" -/* 3674 */ "Generate ECC (ECDSA) key\0" -/* 3699 */ "ECC\0" -/* 3703 */ "ecc\0" -/* 3707 */ "an alias for the 'ecc' option\0" -/* 3737 */ "ecdsa\0" -/* 3743 */ "Hash algorithm to use for signing.\0" -/* 3778 */ "HASH\0" -/* 3783 */ "hash\0" -/* 3788 */ "Use DER format for input certificates and private keys.\0" -/* 3844 */ "INDER\0" -/* 3850 */ "no-inder\0" -/* 3859 */ "no\0" -/* 3862 */ "an alias for the 'inder' option\0" -/* 3894 */ "inraw\0" -/* 3900 */ "Use DER format for output certificates and private keys\0" -/* 3956 */ "OUTDER\0" -/* 3963 */ "no-outder\0" -/* 3973 */ "an alias for the 'outder' option\0" -/* 4006 */ "outraw\0" -/* 4013 */ "Specify the number of bits for key generate\0" -/* 4057 */ "BITS\0" -/* 4062 */ "bits\0" -/* 4067 */ "Specify the security level [low, legacy, normal, high, ultra].\0" -/* 4130 */ "SEC_PARAM\0" -/* 4140 */ "sec-param\0" -/* 4150 */ "No effect\0" -/* 4160 */ "DISABLE_QUICK_RANDOM\0" -/* 4181 */ "disable-quick-random\0" -/* 4202 */ "Template file to use for non-interactive operation\0" -/* 4253 */ "TEMPLATE\0" -/* 4262 */ "template\0" -/* 4271 */ "Cipher to use for PKCS #8 and #12 operations\0" -/* 4316 */ "PKCS_CIPHER\0" -/* 4328 */ "pkcs-cipher\0" -/* 4340 */ "display extended usage information and exit\0" -/* 4384 */ "help\0" -/* 4389 */ "extended usage information passed thru pager\0" -/* 4434 */ "more-help\0" -/* 4444 */ "output version information and exit\0" -/* 4480 */ "version\0" -/* 4488 */ "CERTTOOL\0" -/* 4497 */ "certtool - GnuTLS certificate tool\n" - "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" -/* 4590 */ "bug-gnutls@gnu.org\0" -/* 4609 */ "\n\0" -/* 4611 */ "Tool to parse and generate X.509 certificates, requests and private keys.\n" +/* 884 */ "Enable debugging.\0" +/* 902 */ "DEBUG\0" +/* 908 */ "debug\0" +/* 914 */ "More verbose output\0" +/* 934 */ "VERBOSE\0" +/* 942 */ "verbose\0" +/* 950 */ "Input file\0" +/* 961 */ "INFILE\0" +/* 968 */ "infile\0" +/* 975 */ "Output file\0" +/* 987 */ "OUTFILE\0" +/* 995 */ "outfile\0" +/* 1003 */ "Generate a self-signed certificate\0" +/* 1038 */ "GENERATE_SELF_SIGNED\0" +/* 1059 */ "generate-self-signed\0" +/* 1080 */ "Generate a signed certificate\0" +/* 1110 */ "GENERATE_CERTIFICATE\0" +/* 1131 */ "generate-certificate\0" +/* 1152 */ "Generates a proxy certificate\0" +/* 1182 */ "GENERATE_PROXY\0" +/* 1197 */ "generate-proxy\0" +/* 1212 */ "Generate a CRL\0" +/* 1227 */ "GENERATE_CRL\0" +/* 1240 */ "generate-crl\0" +/* 1253 */ "Update a signed certificate\0" +/* 1281 */ "UPDATE_CERTIFICATE\0" +/* 1300 */ "update-certificate\0" +/* 1319 */ "Generate a private key\0" +/* 1342 */ "GENERATE_PRIVKEY\0" +/* 1359 */ "generate-privkey\0" +/* 1376 */ "Generate a PKCS #10 certificate request\0" +/* 1416 */ "GENERATE_REQUEST\0" +/* 1433 */ "generate-request\0" +/* 1450 */ "Verify a PEM encoded certificate chain.\0" +/* 1490 */ "VERIFY_CHAIN\0" +/* 1503 */ "verify-chain\0" +/* 1516 */ "Verify a PEM encoded certificate chain using a trusted list.\0" +/* 1577 */ "VERIFY\0" +/* 1584 */ "verify\0" +/* 1591 */ "Verify a CRL using a trusted list.\0" +/* 1626 */ "VERIFY_CRL\0" +/* 1637 */ "verify-crl\0" +/* 1648 */ "Generate PKCS #3 encoded Diffie-Hellman parameters.\0" +/* 1700 */ "GENERATE_DH_PARAMS\0" +/* 1719 */ "generate-dh-params\0" +/* 1738 */ "Get the included PKCS #3 encoded Diffie-Hellman parameters.\0" +/* 1798 */ "GET_DH_PARAMS\0" +/* 1812 */ "get-dh-params\0" +/* 1826 */ "Print information PKCS #3 encoded Diffie-Hellman parameters\0" +/* 1886 */ "DH_INFO\0" +/* 1894 */ "dh-info\0" +/* 1902 */ "Loads a private key file\0" +/* 1927 */ "LOAD_PRIVKEY\0" +/* 1940 */ "load-privkey\0" +/* 1953 */ "Loads a public key file\0" +/* 1977 */ "LOAD_PUBKEY\0" +/* 1989 */ "load-pubkey\0" +/* 2001 */ "Loads a certificate request file\0" +/* 2034 */ "LOAD_REQUEST\0" +/* 2047 */ "load-request\0" +/* 2060 */ "Loads a certificate file\0" +/* 2085 */ "LOAD_CERTIFICATE\0" +/* 2102 */ "load-certificate\0" +/* 2119 */ "Loads the certificate authority's private key file\0" +/* 2170 */ "LOAD_CA_PRIVKEY\0" +/* 2186 */ "load-ca-privkey\0" +/* 2202 */ "Loads the certificate authority's certificate file\0" +/* 2253 */ "LOAD_CA_CERTIFICATE\0" +/* 2273 */ "load-ca-certificate\0" +/* 2293 */ "Password to use\0" +/* 2309 */ "PASSWORD\0" +/* 2318 */ "password\0" +/* 2327 */ "Print big number in an easier format to parse\0" +/* 2373 */ "HEX_NUMBERS\0" +/* 2385 */ "hex-numbers\0" +/* 2397 */ "In certain operations it prints the information is C-friendly format\0" +/* 2466 */ "CPRINT\0" +/* 2473 */ "cprint\0" +/* 2480 */ "Enforce a NULL password\0" +/* 2504 */ "NULL_PASSWORD\0" +/* 2518 */ "null-password\0" +/* 2532 */ "Print information on the given certificate\0" +/* 2575 */ "CERTIFICATE_INFO\0" +/* 2592 */ "certificate-info\0" +/* 2609 */ "Print certificate's public key\0" +/* 2640 */ "CERTIFICATE_PUBKEY\0" +/* 2659 */ "certificate-pubkey\0" +/* 2678 */ "Print information on the given OpenPGP certificate\0" +/* 2729 */ "PGP_CERTIFICATE_INFO\0" +/* 2750 */ "pgp-certificate-info\0" +/* 2771 */ "Print information on the given OpenPGP keyring structure\0" +/* 2828 */ "PGP_RING_INFO\0" +/* 2842 */ "pgp-ring-info\0" +/* 2856 */ "Print information on the given CRL structure\0" +/* 2901 */ "CRL_INFO\0" +/* 2910 */ "crl-info\0" +/* 2919 */ "Print information on the given certificate request\0" +/* 2970 */ "CRQ_INFO\0" +/* 2979 */ "crq-info\0" +/* 2988 */ "Do not use extensions in certificate requests\0" +/* 3034 */ "NO_CRQ_EXTENSIONS\0" +/* 3052 */ "no-crq-extensions\0" +/* 3070 */ "Print information on a PKCS #12 structure\0" +/* 3112 */ "P12_INFO\0" +/* 3121 */ "p12-info\0" +/* 3130 */ "Print information on a PKCS #7 structure\0" +/* 3171 */ "P7_INFO\0" +/* 3179 */ "p7-info\0" +/* 3187 */ "Convert S/MIME to PKCS #7 structure\0" +/* 3223 */ "SMIME_TO_P7\0" +/* 3235 */ "smime-to-p7\0" +/* 3247 */ "Print information on a private key\0" +/* 3282 */ "KEY_INFO\0" +/* 3291 */ "key-info\0" +/* 3300 */ "Print information on an OpenPGP private key\0" +/* 3344 */ "PGP_KEY_INFO\0" +/* 3357 */ "pgp-key-info\0" +/* 3370 */ "Print information on a public key\0" +/* 3404 */ "PUBKEY_INFO\0" +/* 3416 */ "pubkey-info\0" +/* 3428 */ "Generate an X.509 version 1 certificate (with no extensions)\0" +/* 3489 */ "V1\0" +/* 3492 */ "v1\0" +/* 3495 */ "Generate a PKCS #12 structure\0" +/* 3525 */ "TO_P12\0" +/* 3532 */ "to-p12\0" +/* 3539 */ "Generate a PKCS #8 structure\0" +/* 3568 */ "TO_P8\0" +/* 3574 */ "to-p8\0" +/* 3580 */ "Use PKCS #8 format for private keys\0" +/* 3616 */ "PKCS8\0" +/* 3622 */ "pkcs8\0" +/* 3628 */ "Generate RSA key\0" +/* 3645 */ "RSA\0" +/* 3649 */ "rsa\0" +/* 3653 */ "Generate DSA key\0" +/* 3670 */ "DSA\0" +/* 3674 */ "dsa\0" +/* 3678 */ "Generate ECC (ECDSA) key\0" +/* 3703 */ "ECC\0" +/* 3707 */ "ecc\0" +/* 3711 */ "This is an alias for 'ecc'\0" +/* 3738 */ "ecdsa\0" +/* 3744 */ "Hash algorithm to use for signing.\0" +/* 3779 */ "HASH\0" +/* 3784 */ "hash\0" +/* 3789 */ "Use DER format for input certificates and private keys.\0" +/* 3845 */ "INDER\0" +/* 3851 */ "no-inder\0" +/* 3860 */ "no\0" +/* 3863 */ "This is an alias for 'inder'\0" +/* 3892 */ "inraw\0" +/* 3898 */ "Use DER format for output certificates and private keys\0" +/* 3954 */ "OUTDER\0" +/* 3961 */ "no-outder\0" +/* 3971 */ "This is an alias for 'outder'\0" +/* 4001 */ "outraw\0" +/* 4008 */ "Specify the number of bits for key generate\0" +/* 4052 */ "BITS\0" +/* 4057 */ "bits\0" +/* 4062 */ "Specify the security level [low, legacy, normal, high, ultra].\0" +/* 4125 */ "SEC_PARAM\0" +/* 4135 */ "sec-param\0" +/* 4145 */ "No effect\0" +/* 4155 */ "DISABLE_QUICK_RANDOM\0" +/* 4176 */ "disable-quick-random\0" +/* 4197 */ "Template file to use for non-interactive operation\0" +/* 4248 */ "TEMPLATE\0" +/* 4257 */ "template\0" +/* 4266 */ "Cipher to use for PKCS #8 and #12 operations\0" +/* 4311 */ "PKCS_CIPHER\0" +/* 4323 */ "pkcs-cipher\0" +/* 4335 */ "Display extended usage information and exit\0" +/* 4379 */ "help\0" +/* 4384 */ "Extended usage information passed thru pager\0" +/* 4429 */ "more-help\0" +/* 4439 */ "Output version information and exit\0" +/* 4475 */ "version\0" +/* 4483 */ "CERTTOOL\0" +/* 4492 */ "certtool - GnuTLS certificate tool - Ver. @VERSION@\n" + "USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" +/* 4602 */ "bug-gnutls@gnu.org\0" +/* 4621 */ "\n\n\0" +/* 4624 */ "\n" + "Tool to parse and generate X.509 certificates, requests and private keys.\n" "It can be used interactively or non interactively by specifying the\n" "template command line option.\n\0" -/* 4784 */ "certtool @VERSION@\0" -/* 4803 */ "certtool [options]\n" +/* 4798 */ "certtool @VERSION@\0" +/* 4817 */ "certtool [options]\n" "certtool --help for usage instructions.\n"; -/** +/* * debug option description: */ -/** Descriptive text for the debug option */ -#define DEBUG_DESC (certtool_opt_strs+880) -/** Upper-cased name for the debug option */ -#define DEBUG_NAME (certtool_opt_strs+898) -/** Name string for the debug option */ -#define DEBUG_name (certtool_opt_strs+904) -/** Compiled in flag settings for the debug option */ +#define DEBUG_DESC (certtool_opt_strs+884) +#define DEBUG_NAME (certtool_opt_strs+902) +#define DEBUG_name (certtool_opt_strs+908) #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) -/** +/* * verbose option description: */ -/** Descriptive text for the verbose option */ -#define VERBOSE_DESC (certtool_opt_strs+910) -/** Upper-cased name for the verbose option */ -#define VERBOSE_NAME (certtool_opt_strs+930) -/** Name string for the verbose option */ -#define VERBOSE_name (certtool_opt_strs+938) -/** Compiled in flag settings for the verbose option */ +#define VERBOSE_DESC (certtool_opt_strs+914) +#define VERBOSE_NAME (certtool_opt_strs+934) +#define VERBOSE_name (certtool_opt_strs+942) #define VERBOSE_FLAGS (OPTST_DISABLED) -/** +/* * infile option description: */ -/** Descriptive text for the infile option */ -#define INFILE_DESC (certtool_opt_strs+946) -/** Upper-cased name for the infile option */ -#define INFILE_NAME (certtool_opt_strs+957) -/** Name string for the infile option */ -#define INFILE_name (certtool_opt_strs+964) -/** Compiled in flag settings for the infile option */ +#define INFILE_DESC (certtool_opt_strs+950) +#define INFILE_NAME (certtool_opt_strs+961) +#define INFILE_name (certtool_opt_strs+968) #define INFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) -/** +/* * outfile option description: */ -/** Descriptive text for the outfile option */ -#define OUTFILE_DESC (certtool_opt_strs+971) -/** Upper-cased name for the outfile option */ -#define OUTFILE_NAME (certtool_opt_strs+983) -/** Name string for the outfile option */ -#define OUTFILE_name (certtool_opt_strs+991) -/** Compiled in flag settings for the outfile option */ +#define OUTFILE_DESC (certtool_opt_strs+975) +#define OUTFILE_NAME (certtool_opt_strs+987) +#define OUTFILE_name (certtool_opt_strs+995) #define OUTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * generate-self-signed option description: */ -/** Descriptive text for the generate-self-signed option */ -#define GENERATE_SELF_SIGNED_DESC (certtool_opt_strs+999) -/** Upper-cased name for the generate-self-signed option */ -#define GENERATE_SELF_SIGNED_NAME (certtool_opt_strs+1034) -/** Name string for the generate-self-signed option */ -#define GENERATE_SELF_SIGNED_name (certtool_opt_strs+1055) -/** Compiled in flag settings for the generate-self-signed option */ +#define GENERATE_SELF_SIGNED_DESC (certtool_opt_strs+1003) +#define GENERATE_SELF_SIGNED_NAME (certtool_opt_strs+1038) +#define GENERATE_SELF_SIGNED_name (certtool_opt_strs+1059) #define GENERATE_SELF_SIGNED_FLAGS (OPTST_DISABLED) -/** +/* * generate-certificate option description: */ -/** Descriptive text for the generate-certificate option */ -#define GENERATE_CERTIFICATE_DESC (certtool_opt_strs+1076) -/** Upper-cased name for the generate-certificate option */ -#define GENERATE_CERTIFICATE_NAME (certtool_opt_strs+1106) -/** Name string for the generate-certificate option */ -#define GENERATE_CERTIFICATE_name (certtool_opt_strs+1127) -/** Compiled in flag settings for the generate-certificate option */ +#define GENERATE_CERTIFICATE_DESC (certtool_opt_strs+1080) +#define GENERATE_CERTIFICATE_NAME (certtool_opt_strs+1110) +#define GENERATE_CERTIFICATE_name (certtool_opt_strs+1131) #define GENERATE_CERTIFICATE_FLAGS (OPTST_DISABLED) -/** +/* * generate-proxy option description: */ -/** Descriptive text for the generate-proxy option */ -#define GENERATE_PROXY_DESC (certtool_opt_strs+1148) -/** Upper-cased name for the generate-proxy option */ -#define GENERATE_PROXY_NAME (certtool_opt_strs+1178) -/** Name string for the generate-proxy option */ -#define GENERATE_PROXY_name (certtool_opt_strs+1193) -/** Compiled in flag settings for the generate-proxy option */ +#define GENERATE_PROXY_DESC (certtool_opt_strs+1152) +#define GENERATE_PROXY_NAME (certtool_opt_strs+1182) +#define GENERATE_PROXY_name (certtool_opt_strs+1197) #define GENERATE_PROXY_FLAGS (OPTST_DISABLED) -/** +/* * generate-crl option description: */ -/** Descriptive text for the generate-crl option */ -#define GENERATE_CRL_DESC (certtool_opt_strs+1208) -/** Upper-cased name for the generate-crl option */ -#define GENERATE_CRL_NAME (certtool_opt_strs+1223) -/** Name string for the generate-crl option */ -#define GENERATE_CRL_name (certtool_opt_strs+1236) -/** Compiled in flag settings for the generate-crl option */ +#define GENERATE_CRL_DESC (certtool_opt_strs+1212) +#define GENERATE_CRL_NAME (certtool_opt_strs+1227) +#define GENERATE_CRL_name (certtool_opt_strs+1240) #define GENERATE_CRL_FLAGS (OPTST_DISABLED) -/** +/* * update-certificate option description: */ -/** Descriptive text for the update-certificate option */ -#define UPDATE_CERTIFICATE_DESC (certtool_opt_strs+1249) -/** Upper-cased name for the update-certificate option */ -#define UPDATE_CERTIFICATE_NAME (certtool_opt_strs+1277) -/** Name string for the update-certificate option */ -#define UPDATE_CERTIFICATE_name (certtool_opt_strs+1296) -/** Compiled in flag settings for the update-certificate option */ +#define UPDATE_CERTIFICATE_DESC (certtool_opt_strs+1253) +#define UPDATE_CERTIFICATE_NAME (certtool_opt_strs+1281) +#define UPDATE_CERTIFICATE_name (certtool_opt_strs+1300) #define UPDATE_CERTIFICATE_FLAGS (OPTST_DISABLED) -/** +/* * generate-privkey option description: */ -/** Descriptive text for the generate-privkey option */ -#define GENERATE_PRIVKEY_DESC (certtool_opt_strs+1315) -/** Upper-cased name for the generate-privkey option */ -#define GENERATE_PRIVKEY_NAME (certtool_opt_strs+1338) -/** Name string for the generate-privkey option */ -#define GENERATE_PRIVKEY_name (certtool_opt_strs+1355) -/** Compiled in flag settings for the generate-privkey option */ +#define GENERATE_PRIVKEY_DESC (certtool_opt_strs+1319) +#define GENERATE_PRIVKEY_NAME (certtool_opt_strs+1342) +#define GENERATE_PRIVKEY_name (certtool_opt_strs+1359) #define GENERATE_PRIVKEY_FLAGS (OPTST_DISABLED) -/** +/* * generate-request option description with * "Must also have options" and "Incompatible options": */ -/** Descriptive text for the generate-request option */ -#define GENERATE_REQUEST_DESC (certtool_opt_strs+1372) -/** Upper-cased name for the generate-request option */ -#define GENERATE_REQUEST_NAME (certtool_opt_strs+1412) -/** Name string for the generate-request option */ -#define GENERATE_REQUEST_name (certtool_opt_strs+1429) -/** Other options that appear in conjunction with the generate-request option */ +#define GENERATE_REQUEST_DESC (certtool_opt_strs+1376) +#define GENERATE_REQUEST_NAME (certtool_opt_strs+1416) +#define GENERATE_REQUEST_name (certtool_opt_strs+1433) static int const aGenerate_RequestCantList[] = { INDEX_OPT_INFILE, NO_EQUIVALENT }; -/** Compiled in flag settings for the generate-request option */ #define GENERATE_REQUEST_FLAGS (OPTST_DISABLED) -/** +/* * verify-chain option description: */ -/** Descriptive text for the verify-chain option */ -#define VERIFY_CHAIN_DESC (certtool_opt_strs+1446) -/** Upper-cased name for the verify-chain option */ -#define VERIFY_CHAIN_NAME (certtool_opt_strs+1486) -/** Name string for the verify-chain option */ -#define VERIFY_CHAIN_name (certtool_opt_strs+1499) -/** Compiled in flag settings for the verify-chain option */ +#define VERIFY_CHAIN_DESC (certtool_opt_strs+1450) +#define VERIFY_CHAIN_NAME (certtool_opt_strs+1490) +#define VERIFY_CHAIN_name (certtool_opt_strs+1503) #define VERIFY_CHAIN_FLAGS (OPTST_DISABLED) -/** +/* * verify option description with * "Must also have options" and "Incompatible options": */ -/** Descriptive text for the verify option */ -#define VERIFY_DESC (certtool_opt_strs+1512) -/** Upper-cased name for the verify option */ -#define VERIFY_NAME (certtool_opt_strs+1573) -/** Name string for the verify option */ -#define VERIFY_name (certtool_opt_strs+1580) -/** Other options that are required by the verify option */ +#define VERIFY_DESC (certtool_opt_strs+1516) +#define VERIFY_NAME (certtool_opt_strs+1577) +#define VERIFY_name (certtool_opt_strs+1584) static int const aVerifyMustList[] = { INDEX_OPT_LOAD_CA_CERTIFICATE, NO_EQUIVALENT }; -/** Compiled in flag settings for the verify option */ #define VERIFY_FLAGS (OPTST_DISABLED) -/** +/* * verify-crl option description with * "Must also have options" and "Incompatible options": */ -/** Descriptive text for the verify-crl option */ -#define VERIFY_CRL_DESC (certtool_opt_strs+1587) -/** Upper-cased name for the verify-crl option */ -#define VERIFY_CRL_NAME (certtool_opt_strs+1622) -/** Name string for the verify-crl option */ -#define VERIFY_CRL_name (certtool_opt_strs+1633) -/** Other options that are required by the verify-crl option */ +#define VERIFY_CRL_DESC (certtool_opt_strs+1591) +#define VERIFY_CRL_NAME (certtool_opt_strs+1626) +#define VERIFY_CRL_name (certtool_opt_strs+1637) static int const aVerify_CrlMustList[] = { INDEX_OPT_LOAD_CA_CERTIFICATE, NO_EQUIVALENT }; -/** Compiled in flag settings for the verify-crl option */ #define VERIFY_CRL_FLAGS (OPTST_DISABLED) -/** +/* * generate-dh-params option description: */ -/** Descriptive text for the generate-dh-params option */ -#define GENERATE_DH_PARAMS_DESC (certtool_opt_strs+1644) -/** Upper-cased name for the generate-dh-params option */ -#define GENERATE_DH_PARAMS_NAME (certtool_opt_strs+1696) -/** Name string for the generate-dh-params option */ -#define GENERATE_DH_PARAMS_name (certtool_opt_strs+1715) -/** Compiled in flag settings for the generate-dh-params option */ +#define GENERATE_DH_PARAMS_DESC (certtool_opt_strs+1648) +#define GENERATE_DH_PARAMS_NAME (certtool_opt_strs+1700) +#define GENERATE_DH_PARAMS_name (certtool_opt_strs+1719) #define GENERATE_DH_PARAMS_FLAGS (OPTST_DISABLED) -/** +/* * get-dh-params option description: */ -/** Descriptive text for the get-dh-params option */ -#define GET_DH_PARAMS_DESC (certtool_opt_strs+1734) -/** Upper-cased name for the get-dh-params option */ -#define GET_DH_PARAMS_NAME (certtool_opt_strs+1794) -/** Name string for the get-dh-params option */ -#define GET_DH_PARAMS_name (certtool_opt_strs+1808) -/** Compiled in flag settings for the get-dh-params option */ +#define GET_DH_PARAMS_DESC (certtool_opt_strs+1738) +#define GET_DH_PARAMS_NAME (certtool_opt_strs+1798) +#define GET_DH_PARAMS_name (certtool_opt_strs+1812) #define GET_DH_PARAMS_FLAGS (OPTST_DISABLED) -/** +/* * dh-info option description: */ -/** Descriptive text for the dh-info option */ -#define DH_INFO_DESC (certtool_opt_strs+1822) -/** Upper-cased name for the dh-info option */ -#define DH_INFO_NAME (certtool_opt_strs+1882) -/** Name string for the dh-info option */ -#define DH_INFO_name (certtool_opt_strs+1890) -/** Compiled in flag settings for the dh-info option */ +#define DH_INFO_DESC (certtool_opt_strs+1826) +#define DH_INFO_NAME (certtool_opt_strs+1886) +#define DH_INFO_name (certtool_opt_strs+1894) #define DH_INFO_FLAGS (OPTST_DISABLED) -/** +/* * load-privkey option description: */ -/** Descriptive text for the load-privkey option */ -#define LOAD_PRIVKEY_DESC (certtool_opt_strs+1898) -/** Upper-cased name for the load-privkey option */ -#define LOAD_PRIVKEY_NAME (certtool_opt_strs+1923) -/** Name string for the load-privkey option */ -#define LOAD_PRIVKEY_name (certtool_opt_strs+1936) -/** Compiled in flag settings for the load-privkey option */ +#define LOAD_PRIVKEY_DESC (certtool_opt_strs+1902) +#define LOAD_PRIVKEY_NAME (certtool_opt_strs+1927) +#define LOAD_PRIVKEY_name (certtool_opt_strs+1940) #define LOAD_PRIVKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * load-pubkey option description: */ -/** Descriptive text for the load-pubkey option */ -#define LOAD_PUBKEY_DESC (certtool_opt_strs+1949) -/** Upper-cased name for the load-pubkey option */ -#define LOAD_PUBKEY_NAME (certtool_opt_strs+1973) -/** Name string for the load-pubkey option */ -#define LOAD_PUBKEY_name (certtool_opt_strs+1985) -/** Compiled in flag settings for the load-pubkey option */ +#define LOAD_PUBKEY_DESC (certtool_opt_strs+1953) +#define LOAD_PUBKEY_NAME (certtool_opt_strs+1977) +#define LOAD_PUBKEY_name (certtool_opt_strs+1989) #define LOAD_PUBKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * load-request option description: */ -/** Descriptive text for the load-request option */ -#define LOAD_REQUEST_DESC (certtool_opt_strs+1997) -/** Upper-cased name for the load-request option */ -#define LOAD_REQUEST_NAME (certtool_opt_strs+2030) -/** Name string for the load-request option */ -#define LOAD_REQUEST_name (certtool_opt_strs+2043) -/** Compiled in flag settings for the load-request option */ +#define LOAD_REQUEST_DESC (certtool_opt_strs+2001) +#define LOAD_REQUEST_NAME (certtool_opt_strs+2034) +#define LOAD_REQUEST_name (certtool_opt_strs+2047) #define LOAD_REQUEST_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) -/** +/* * load-certificate option description: */ -/** Descriptive text for the load-certificate option */ -#define LOAD_CERTIFICATE_DESC (certtool_opt_strs+2056) -/** Upper-cased name for the load-certificate option */ -#define LOAD_CERTIFICATE_NAME (certtool_opt_strs+2081) -/** Name string for the load-certificate option */ -#define LOAD_CERTIFICATE_name (certtool_opt_strs+2098) -/** Compiled in flag settings for the load-certificate option */ +#define LOAD_CERTIFICATE_DESC (certtool_opt_strs+2060) +#define LOAD_CERTIFICATE_NAME (certtool_opt_strs+2085) +#define LOAD_CERTIFICATE_name (certtool_opt_strs+2102) #define LOAD_CERTIFICATE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * load-ca-privkey option description: */ -/** Descriptive text for the load-ca-privkey option */ -#define LOAD_CA_PRIVKEY_DESC (certtool_opt_strs+2115) -/** Upper-cased name for the load-ca-privkey option */ -#define LOAD_CA_PRIVKEY_NAME (certtool_opt_strs+2166) -/** Name string for the load-ca-privkey option */ -#define LOAD_CA_PRIVKEY_name (certtool_opt_strs+2182) -/** Compiled in flag settings for the load-ca-privkey option */ +#define LOAD_CA_PRIVKEY_DESC (certtool_opt_strs+2119) +#define LOAD_CA_PRIVKEY_NAME (certtool_opt_strs+2170) +#define LOAD_CA_PRIVKEY_name (certtool_opt_strs+2186) #define LOAD_CA_PRIVKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * load-ca-certificate option description: */ -/** Descriptive text for the load-ca-certificate option */ -#define LOAD_CA_CERTIFICATE_DESC (certtool_opt_strs+2198) -/** Upper-cased name for the load-ca-certificate option */ -#define LOAD_CA_CERTIFICATE_NAME (certtool_opt_strs+2249) -/** Name string for the load-ca-certificate option */ -#define LOAD_CA_CERTIFICATE_name (certtool_opt_strs+2269) -/** Compiled in flag settings for the load-ca-certificate option */ +#define LOAD_CA_CERTIFICATE_DESC (certtool_opt_strs+2202) +#define LOAD_CA_CERTIFICATE_NAME (certtool_opt_strs+2253) +#define LOAD_CA_CERTIFICATE_name (certtool_opt_strs+2273) #define LOAD_CA_CERTIFICATE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * password option description: */ -/** Descriptive text for the password option */ -#define PASSWORD_DESC (certtool_opt_strs+2289) -/** Upper-cased name for the password option */ -#define PASSWORD_NAME (certtool_opt_strs+2305) -/** Name string for the password option */ -#define PASSWORD_name (certtool_opt_strs+2314) -/** Compiled in flag settings for the password option */ +#define PASSWORD_DESC (certtool_opt_strs+2293) +#define PASSWORD_NAME (certtool_opt_strs+2309) +#define PASSWORD_name (certtool_opt_strs+2318) #define PASSWORD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * hex-numbers option description: */ -/** Descriptive text for the hex-numbers option */ -#define HEX_NUMBERS_DESC (certtool_opt_strs+2323) -/** Upper-cased name for the hex-numbers option */ -#define HEX_NUMBERS_NAME (certtool_opt_strs+2369) -/** Name string for the hex-numbers option */ -#define HEX_NUMBERS_name (certtool_opt_strs+2381) -/** Compiled in flag settings for the hex-numbers option */ +#define HEX_NUMBERS_DESC (certtool_opt_strs+2327) +#define HEX_NUMBERS_NAME (certtool_opt_strs+2373) +#define HEX_NUMBERS_name (certtool_opt_strs+2385) #define HEX_NUMBERS_FLAGS (OPTST_DISABLED) -/** +/* * cprint option description: */ -/** Descriptive text for the cprint option */ -#define CPRINT_DESC (certtool_opt_strs+2393) -/** Upper-cased name for the cprint option */ -#define CPRINT_NAME (certtool_opt_strs+2462) -/** Name string for the cprint option */ -#define CPRINT_name (certtool_opt_strs+2469) -/** Compiled in flag settings for the cprint option */ +#define CPRINT_DESC (certtool_opt_strs+2397) +#define CPRINT_NAME (certtool_opt_strs+2466) +#define CPRINT_name (certtool_opt_strs+2473) #define CPRINT_FLAGS (OPTST_DISABLED) -/** +/* * null-password option description: */ -/** Descriptive text for the null-password option */ -#define NULL_PASSWORD_DESC (certtool_opt_strs+2476) -/** Upper-cased name for the null-password option */ -#define NULL_PASSWORD_NAME (certtool_opt_strs+2500) -/** Name string for the null-password option */ -#define NULL_PASSWORD_name (certtool_opt_strs+2514) -/** Compiled in flag settings for the null-password option */ +#define NULL_PASSWORD_DESC (certtool_opt_strs+2480) +#define NULL_PASSWORD_NAME (certtool_opt_strs+2504) +#define NULL_PASSWORD_name (certtool_opt_strs+2518) #define NULL_PASSWORD_FLAGS (OPTST_DISABLED) -/** +/* * certificate-info option description: */ -/** Descriptive text for the certificate-info option */ -#define CERTIFICATE_INFO_DESC (certtool_opt_strs+2528) -/** Upper-cased name for the certificate-info option */ -#define CERTIFICATE_INFO_NAME (certtool_opt_strs+2571) -/** Name string for the certificate-info option */ -#define CERTIFICATE_INFO_name (certtool_opt_strs+2588) -/** Compiled in flag settings for the certificate-info option */ +#define CERTIFICATE_INFO_DESC (certtool_opt_strs+2532) +#define CERTIFICATE_INFO_NAME (certtool_opt_strs+2575) +#define CERTIFICATE_INFO_name (certtool_opt_strs+2592) #define CERTIFICATE_INFO_FLAGS (OPTST_DISABLED) -/** +/* * certificate-pubkey option description: */ -/** Descriptive text for the certificate-pubkey option */ -#define CERTIFICATE_PUBKEY_DESC (certtool_opt_strs+2605) -/** Upper-cased name for the certificate-pubkey option */ -#define CERTIFICATE_PUBKEY_NAME (certtool_opt_strs+2636) -/** Name string for the certificate-pubkey option */ -#define CERTIFICATE_PUBKEY_name (certtool_opt_strs+2655) -/** Compiled in flag settings for the certificate-pubkey option */ +#define CERTIFICATE_PUBKEY_DESC (certtool_opt_strs+2609) +#define CERTIFICATE_PUBKEY_NAME (certtool_opt_strs+2640) +#define CERTIFICATE_PUBKEY_name (certtool_opt_strs+2659) #define CERTIFICATE_PUBKEY_FLAGS (OPTST_DISABLED) -/** +/* * pgp-certificate-info option description: */ -/** Descriptive text for the pgp-certificate-info option */ -#define PGP_CERTIFICATE_INFO_DESC (certtool_opt_strs+2674) -/** Upper-cased name for the pgp-certificate-info option */ -#define PGP_CERTIFICATE_INFO_NAME (certtool_opt_strs+2725) -/** Name string for the pgp-certificate-info option */ -#define PGP_CERTIFICATE_INFO_name (certtool_opt_strs+2746) -/** Compiled in flag settings for the pgp-certificate-info option */ +#define PGP_CERTIFICATE_INFO_DESC (certtool_opt_strs+2678) +#define PGP_CERTIFICATE_INFO_NAME (certtool_opt_strs+2729) +#define PGP_CERTIFICATE_INFO_name (certtool_opt_strs+2750) #define PGP_CERTIFICATE_INFO_FLAGS (OPTST_DISABLED) -/** +/* * pgp-ring-info option description: */ -/** Descriptive text for the pgp-ring-info option */ -#define PGP_RING_INFO_DESC (certtool_opt_strs+2767) -/** Upper-cased name for the pgp-ring-info option */ -#define PGP_RING_INFO_NAME (certtool_opt_strs+2824) -/** Name string for the pgp-ring-info option */ -#define PGP_RING_INFO_name (certtool_opt_strs+2838) -/** Compiled in flag settings for the pgp-ring-info option */ +#define PGP_RING_INFO_DESC (certtool_opt_strs+2771) +#define PGP_RING_INFO_NAME (certtool_opt_strs+2828) +#define PGP_RING_INFO_name (certtool_opt_strs+2842) #define PGP_RING_INFO_FLAGS (OPTST_DISABLED) -/** +/* * crl-info option description: */ -/** Descriptive text for the crl-info option */ -#define CRL_INFO_DESC (certtool_opt_strs+2852) -/** Upper-cased name for the crl-info option */ -#define CRL_INFO_NAME (certtool_opt_strs+2897) -/** Name string for the crl-info option */ -#define CRL_INFO_name (certtool_opt_strs+2906) -/** Compiled in flag settings for the crl-info option */ +#define CRL_INFO_DESC (certtool_opt_strs+2856) +#define CRL_INFO_NAME (certtool_opt_strs+2901) +#define CRL_INFO_name (certtool_opt_strs+2910) #define CRL_INFO_FLAGS (OPTST_DISABLED) -/** +/* * crq-info option description: */ -/** Descriptive text for the crq-info option */ -#define CRQ_INFO_DESC (certtool_opt_strs+2915) -/** Upper-cased name for the crq-info option */ -#define CRQ_INFO_NAME (certtool_opt_strs+2966) -/** Name string for the crq-info option */ -#define CRQ_INFO_name (certtool_opt_strs+2975) -/** Compiled in flag settings for the crq-info option */ +#define CRQ_INFO_DESC (certtool_opt_strs+2919) +#define CRQ_INFO_NAME (certtool_opt_strs+2970) +#define CRQ_INFO_name (certtool_opt_strs+2979) #define CRQ_INFO_FLAGS (OPTST_DISABLED) -/** +/* * no-crq-extensions option description: */ -/** Descriptive text for the no-crq-extensions option */ -#define NO_CRQ_EXTENSIONS_DESC (certtool_opt_strs+2984) -/** Upper-cased name for the no-crq-extensions option */ -#define NO_CRQ_EXTENSIONS_NAME (certtool_opt_strs+3030) -/** Name string for the no-crq-extensions option */ -#define NO_CRQ_EXTENSIONS_name (certtool_opt_strs+3048) -/** Compiled in flag settings for the no-crq-extensions option */ +#define NO_CRQ_EXTENSIONS_DESC (certtool_opt_strs+2988) +#define NO_CRQ_EXTENSIONS_NAME (certtool_opt_strs+3034) +#define NO_CRQ_EXTENSIONS_name (certtool_opt_strs+3052) #define NO_CRQ_EXTENSIONS_FLAGS (OPTST_DISABLED) -/** +/* * p12-info option description: */ -/** Descriptive text for the p12-info option */ -#define P12_INFO_DESC (certtool_opt_strs+3066) -/** Upper-cased name for the p12-info option */ -#define P12_INFO_NAME (certtool_opt_strs+3108) -/** Name string for the p12-info option */ -#define P12_INFO_name (certtool_opt_strs+3117) -/** Compiled in flag settings for the p12-info option */ +#define P12_INFO_DESC (certtool_opt_strs+3070) +#define P12_INFO_NAME (certtool_opt_strs+3112) +#define P12_INFO_name (certtool_opt_strs+3121) #define P12_INFO_FLAGS (OPTST_DISABLED) -/** +/* * p7-info option description: */ -/** Descriptive text for the p7-info option */ -#define P7_INFO_DESC (certtool_opt_strs+3126) -/** Upper-cased name for the p7-info option */ -#define P7_INFO_NAME (certtool_opt_strs+3167) -/** Name string for the p7-info option */ -#define P7_INFO_name (certtool_opt_strs+3175) -/** Compiled in flag settings for the p7-info option */ +#define P7_INFO_DESC (certtool_opt_strs+3130) +#define P7_INFO_NAME (certtool_opt_strs+3171) +#define P7_INFO_name (certtool_opt_strs+3179) #define P7_INFO_FLAGS (OPTST_DISABLED) -/** +/* * smime-to-p7 option description: */ -/** Descriptive text for the smime-to-p7 option */ -#define SMIME_TO_P7_DESC (certtool_opt_strs+3183) -/** Upper-cased name for the smime-to-p7 option */ -#define SMIME_TO_P7_NAME (certtool_opt_strs+3219) -/** Name string for the smime-to-p7 option */ -#define SMIME_TO_P7_name (certtool_opt_strs+3231) -/** Compiled in flag settings for the smime-to-p7 option */ +#define SMIME_TO_P7_DESC (certtool_opt_strs+3187) +#define SMIME_TO_P7_NAME (certtool_opt_strs+3223) +#define SMIME_TO_P7_name (certtool_opt_strs+3235) #define SMIME_TO_P7_FLAGS (OPTST_DISABLED) -/** +/* * key-info option description: */ -/** Descriptive text for the key-info option */ -#define KEY_INFO_DESC (certtool_opt_strs+3243) -/** Upper-cased name for the key-info option */ -#define KEY_INFO_NAME (certtool_opt_strs+3278) -/** Name string for the key-info option */ -#define KEY_INFO_name (certtool_opt_strs+3287) -/** Compiled in flag settings for the key-info option */ +#define KEY_INFO_DESC (certtool_opt_strs+3247) +#define KEY_INFO_NAME (certtool_opt_strs+3282) +#define KEY_INFO_name (certtool_opt_strs+3291) #define KEY_INFO_FLAGS (OPTST_DISABLED) -/** +/* * pgp-key-info option description: */ -/** Descriptive text for the pgp-key-info option */ -#define PGP_KEY_INFO_DESC (certtool_opt_strs+3296) -/** Upper-cased name for the pgp-key-info option */ -#define PGP_KEY_INFO_NAME (certtool_opt_strs+3340) -/** Name string for the pgp-key-info option */ -#define PGP_KEY_INFO_name (certtool_opt_strs+3353) -/** Compiled in flag settings for the pgp-key-info option */ +#define PGP_KEY_INFO_DESC (certtool_opt_strs+3300) +#define PGP_KEY_INFO_NAME (certtool_opt_strs+3344) +#define PGP_KEY_INFO_name (certtool_opt_strs+3357) #define PGP_KEY_INFO_FLAGS (OPTST_DISABLED) -/** +/* * pubkey-info option description: */ -/** Descriptive text for the pubkey-info option */ -#define PUBKEY_INFO_DESC (certtool_opt_strs+3366) -/** Upper-cased name for the pubkey-info option */ -#define PUBKEY_INFO_NAME (certtool_opt_strs+3400) -/** Name string for the pubkey-info option */ -#define PUBKEY_INFO_name (certtool_opt_strs+3412) -/** Compiled in flag settings for the pubkey-info option */ +#define PUBKEY_INFO_DESC (certtool_opt_strs+3370) +#define PUBKEY_INFO_NAME (certtool_opt_strs+3404) +#define PUBKEY_INFO_name (certtool_opt_strs+3416) #define PUBKEY_INFO_FLAGS (OPTST_DISABLED) -/** +/* * v1 option description: */ -/** Descriptive text for the v1 option */ -#define V1_DESC (certtool_opt_strs+3424) -/** Upper-cased name for the v1 option */ -#define V1_NAME (certtool_opt_strs+3485) -/** Name string for the v1 option */ -#define V1_name (certtool_opt_strs+3488) -/** Compiled in flag settings for the v1 option */ +#define V1_DESC (certtool_opt_strs+3428) +#define V1_NAME (certtool_opt_strs+3489) +#define V1_name (certtool_opt_strs+3492) #define V1_FLAGS (OPTST_DISABLED) -/** +/* * to-p12 option description with * "Must also have options" and "Incompatible options": */ -/** Descriptive text for the to-p12 option */ -#define TO_P12_DESC (certtool_opt_strs+3491) -/** Upper-cased name for the to-p12 option */ -#define TO_P12_NAME (certtool_opt_strs+3521) -/** Name string for the to-p12 option */ -#define TO_P12_name (certtool_opt_strs+3528) -/** Other options that are required by the to-p12 option */ +#define TO_P12_DESC (certtool_opt_strs+3495) +#define TO_P12_NAME (certtool_opt_strs+3525) +#define TO_P12_name (certtool_opt_strs+3532) static int const aTo_P12MustList[] = { INDEX_OPT_LOAD_CERTIFICATE, NO_EQUIVALENT }; -/** Compiled in flag settings for the to-p12 option */ #define TO_P12_FLAGS (OPTST_DISABLED) -/** +/* * to-p8 option description: */ -/** Descriptive text for the to-p8 option */ -#define TO_P8_DESC (certtool_opt_strs+3535) -/** Upper-cased name for the to-p8 option */ -#define TO_P8_NAME (certtool_opt_strs+3564) -/** Name string for the to-p8 option */ -#define TO_P8_name (certtool_opt_strs+3570) -/** Compiled in flag settings for the to-p8 option */ +#define TO_P8_DESC (certtool_opt_strs+3539) +#define TO_P8_NAME (certtool_opt_strs+3568) +#define TO_P8_name (certtool_opt_strs+3574) #define TO_P8_FLAGS (OPTST_DISABLED) -/** +/* * pkcs8 option description: */ -/** Descriptive text for the pkcs8 option */ -#define PKCS8_DESC (certtool_opt_strs+3576) -/** Upper-cased name for the pkcs8 option */ -#define PKCS8_NAME (certtool_opt_strs+3612) -/** Name string for the pkcs8 option */ -#define PKCS8_name (certtool_opt_strs+3618) -/** Compiled in flag settings for the pkcs8 option */ +#define PKCS8_DESC (certtool_opt_strs+3580) +#define PKCS8_NAME (certtool_opt_strs+3616) +#define PKCS8_name (certtool_opt_strs+3622) #define PKCS8_FLAGS (OPTST_DISABLED) -/** +/* * rsa option description: */ -/** Descriptive text for the rsa option */ -#define RSA_DESC (certtool_opt_strs+3624) -/** Upper-cased name for the rsa option */ -#define RSA_NAME (certtool_opt_strs+3641) -/** Name string for the rsa option */ -#define RSA_name (certtool_opt_strs+3645) -/** Compiled in flag settings for the rsa option */ +#define RSA_DESC (certtool_opt_strs+3628) +#define RSA_NAME (certtool_opt_strs+3645) +#define RSA_name (certtool_opt_strs+3649) #define RSA_FLAGS (OPTST_DISABLED) -/** +/* * dsa option description: */ -/** Descriptive text for the dsa option */ -#define DSA_DESC (certtool_opt_strs+3649) -/** Upper-cased name for the dsa option */ -#define DSA_NAME (certtool_opt_strs+3666) -/** Name string for the dsa option */ -#define DSA_name (certtool_opt_strs+3670) -/** Compiled in flag settings for the dsa option */ +#define DSA_DESC (certtool_opt_strs+3653) +#define DSA_NAME (certtool_opt_strs+3670) +#define DSA_name (certtool_opt_strs+3674) #define DSA_FLAGS (OPTST_DISABLED) -/** +/* * ecc option description: */ -/** Descriptive text for the ecc option */ -#define ECC_DESC (certtool_opt_strs+3674) -/** Upper-cased name for the ecc option */ -#define ECC_NAME (certtool_opt_strs+3699) -/** Name string for the ecc option */ -#define ECC_name (certtool_opt_strs+3703) -/** Compiled in flag settings for the ecc option */ +#define ECC_DESC (certtool_opt_strs+3678) +#define ECC_NAME (certtool_opt_strs+3703) +#define ECC_name (certtool_opt_strs+3707) #define ECC_FLAGS (OPTST_DISABLED) -/** +/* * ecdsa option description: */ -/** Descriptive text for the ecdsa option */ -#define ECDSA_DESC (certtool_opt_strs+3707) +#define ECDSA_DESC (certtool_opt_strs+3711) #define ECDSA_NAME NULL -/** Unmodified name string for the ecdsa option */ -#define ECDSA_name (certtool_opt_strs+3737) -/** Compiled in flag settings for the ecdsa option */ +#define ECDSA_name (certtool_opt_strs+3738) #define ECDSA_FLAGS (ECC_FLAGS | OPTST_ALIAS) -/** +/* * hash option description: */ -/** Descriptive text for the hash option */ -#define HASH_DESC (certtool_opt_strs+3743) -/** Upper-cased name for the hash option */ -#define HASH_NAME (certtool_opt_strs+3778) -/** Name string for the hash option */ -#define HASH_name (certtool_opt_strs+3783) -/** Compiled in flag settings for the hash option */ +#define HASH_DESC (certtool_opt_strs+3744) +#define HASH_NAME (certtool_opt_strs+3779) +#define HASH_name (certtool_opt_strs+3784) #define HASH_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * inder option description: */ -/** Descriptive text for the inder option */ -#define INDER_DESC (certtool_opt_strs+3788) -/** Upper-cased name for the inder option */ -#define INDER_NAME (certtool_opt_strs+3844) -/** disablement name for the inder option */ -#define NOT_INDER_name (certtool_opt_strs+3850) -/** disablement prefix for the inder option */ -#define NOT_INDER_PFX (certtool_opt_strs+3859) -/** Name string for the inder option */ +#define INDER_DESC (certtool_opt_strs+3789) +#define INDER_NAME (certtool_opt_strs+3845) +#define NOT_INDER_name (certtool_opt_strs+3851) +#define NOT_INDER_PFX (certtool_opt_strs+3860) #define INDER_name (NOT_INDER_name + 3) -/** Compiled in flag settings for the inder option */ #define INDER_FLAGS (OPTST_DISABLED) -/** +/* * inraw option description: */ -/** Descriptive text for the inraw option */ -#define INRAW_DESC (certtool_opt_strs+3862) +#define INRAW_DESC (certtool_opt_strs+3863) #define INRAW_NAME NULL -/** Unmodified name string for the inraw option */ -#define INRAW_name (certtool_opt_strs+3894) -/** Compiled in flag settings for the inraw option */ +#define INRAW_name (certtool_opt_strs+3892) #define INRAW_FLAGS (INDER_FLAGS | OPTST_ALIAS) -/** +/* * outder option description: */ -/** Descriptive text for the outder option */ -#define OUTDER_DESC (certtool_opt_strs+3900) -/** Upper-cased name for the outder option */ -#define OUTDER_NAME (certtool_opt_strs+3956) -/** disablement name for the outder option */ -#define NOT_OUTDER_name (certtool_opt_strs+3963) -/** disablement prefix for the outder option */ -#define NOT_OUTDER_PFX (certtool_opt_strs+3859) -/** Name string for the outder option */ +#define OUTDER_DESC (certtool_opt_strs+3898) +#define OUTDER_NAME (certtool_opt_strs+3954) +#define NOT_OUTDER_name (certtool_opt_strs+3961) +#define NOT_OUTDER_PFX (certtool_opt_strs+3860) #define OUTDER_name (NOT_OUTDER_name + 3) -/** Compiled in flag settings for the outder option */ #define OUTDER_FLAGS (OPTST_DISABLED) -/** +/* * outraw option description: */ -/** Descriptive text for the outraw option */ -#define OUTRAW_DESC (certtool_opt_strs+3973) +#define OUTRAW_DESC (certtool_opt_strs+3971) #define OUTRAW_NAME NULL -/** Unmodified name string for the outraw option */ -#define OUTRAW_name (certtool_opt_strs+4006) -/** Compiled in flag settings for the outraw option */ +#define OUTRAW_name (certtool_opt_strs+4001) #define OUTRAW_FLAGS (OUTDER_FLAGS | OPTST_ALIAS) -/** +/* * bits option description: */ -/** Descriptive text for the bits option */ -#define BITS_DESC (certtool_opt_strs+4013) -/** Upper-cased name for the bits option */ -#define BITS_NAME (certtool_opt_strs+4057) -/** Name string for the bits option */ -#define BITS_name (certtool_opt_strs+4062) -/** Compiled in flag settings for the bits option */ +#define BITS_DESC (certtool_opt_strs+4008) +#define BITS_NAME (certtool_opt_strs+4052) +#define BITS_name (certtool_opt_strs+4057) #define BITS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) -/** +/* * sec-param option description: */ -/** Descriptive text for the sec-param option */ -#define SEC_PARAM_DESC (certtool_opt_strs+4067) -/** Upper-cased name for the sec-param option */ -#define SEC_PARAM_NAME (certtool_opt_strs+4130) -/** Name string for the sec-param option */ -#define SEC_PARAM_name (certtool_opt_strs+4140) -/** Compiled in flag settings for the sec-param option */ +#define SEC_PARAM_DESC (certtool_opt_strs+4062) +#define SEC_PARAM_NAME (certtool_opt_strs+4125) +#define SEC_PARAM_name (certtool_opt_strs+4135) #define SEC_PARAM_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * disable-quick-random option description: */ -/** Descriptive text for the disable-quick-random option */ -#define DISABLE_QUICK_RANDOM_DESC (certtool_opt_strs+4150) -/** Upper-cased name for the disable-quick-random option */ -#define DISABLE_QUICK_RANDOM_NAME (certtool_opt_strs+4160) -/** Name string for the disable-quick-random option */ -#define DISABLE_QUICK_RANDOM_name (certtool_opt_strs+4181) -/** Compiled in flag settings for the disable-quick-random option */ +#define DISABLE_QUICK_RANDOM_DESC (certtool_opt_strs+4145) +#define DISABLE_QUICK_RANDOM_NAME (certtool_opt_strs+4155) +#define DISABLE_QUICK_RANDOM_name (certtool_opt_strs+4176) #define DISABLE_QUICK_RANDOM_FLAGS (OPTST_DISABLED) -/** +/* * template option description: */ -/** Descriptive text for the template option */ -#define TEMPLATE_DESC (certtool_opt_strs+4202) -/** Upper-cased name for the template option */ -#define TEMPLATE_NAME (certtool_opt_strs+4253) -/** Name string for the template option */ -#define TEMPLATE_name (certtool_opt_strs+4262) -/** Compiled in flag settings for the template option */ +#define TEMPLATE_DESC (certtool_opt_strs+4197) +#define TEMPLATE_NAME (certtool_opt_strs+4248) +#define TEMPLATE_name (certtool_opt_strs+4257) #define TEMPLATE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) -/** +/* * pkcs-cipher option description: */ -/** Descriptive text for the pkcs-cipher option */ -#define PKCS_CIPHER_DESC (certtool_opt_strs+4271) -/** Upper-cased name for the pkcs-cipher option */ -#define PKCS_CIPHER_NAME (certtool_opt_strs+4316) -/** Name string for the pkcs-cipher option */ -#define PKCS_CIPHER_name (certtool_opt_strs+4328) -/** Compiled in flag settings for the pkcs-cipher option */ +#define PKCS_CIPHER_DESC (certtool_opt_strs+4266) +#define PKCS_CIPHER_NAME (certtool_opt_strs+4311) +#define PKCS_CIPHER_name (certtool_opt_strs+4323) #define PKCS_CIPHER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (certtool_opt_strs+4340) -#define HELP_name (certtool_opt_strs+4384) +#define HELP_DESC (certtool_opt_strs+4335) +#define HELP_name (certtool_opt_strs+4379) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (certtool_opt_strs+4389) -#define MORE_HELP_name (certtool_opt_strs+4434) +#define MORE_HELP_DESC (certtool_opt_strs+4384) +#define MORE_HELP_name (certtool_opt_strs+4429) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC NULL @@ -1021,9 +790,9 @@ static int const aTo_P12MustList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (certtool_opt_strs+4444) -#define VER_name (certtool_opt_strs+4480) -/** +#define VER_DESC (certtool_opt_strs+4439) +#define VER_name (certtool_opt_strs+4475) +/* * Declare option callback procedures */ extern tOptProc @@ -1744,7 +1513,7 @@ static tOptDesc optDesc[OPTION_CT] = { /* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_VERSION, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ VER_FLAGS, AOUSE_VERSION, + /* opt state flags */ VER_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -1758,7 +1527,7 @@ static tOptDesc optDesc[OPTION_CT] = { /* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_HELP, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP, + /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -1770,7 +1539,7 @@ static tOptDesc optDesc[OPTION_CT] = { /* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_MORE_HELP, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ MORE_HELP_FLAGS, AOUSE_MORE_HELP, + /* opt state flags */ MORE_HELP_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -1780,24 +1549,19 @@ static tOptDesc optDesc[OPTION_CT] = { }; -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/** Reference to the upper cased version of certtool. */ -#define zPROGNAME (certtool_opt_strs+4488) -/** Reference to the title line for certtool usage. */ -#define zUsageTitle (certtool_opt_strs+4497) -/** There is no certtool configuration file. */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Define the certtool Option Environment + */ +#define zPROGNAME (certtool_opt_strs+4483) +#define zUsageTitle (certtool_opt_strs+4492) #define zRcName NULL -/** There are no directories to search for certtool config files. */ #define apzHomeList NULL -/** The certtool program bug email address. */ -#define zBugsAddr (certtool_opt_strs+4590) -/** Clarification/explanation of what certtool does. */ -#define zExplain (certtool_opt_strs+4609) -/** Extra detail explaining what certtool does. */ -#define zDetail (certtool_opt_strs+4611) -/** The full version string for certtool. */ -#define zFullVersion (certtool_opt_strs+4784) -/* extracted from optcode.tlib near line 371 */ +#define zBugsAddr (certtool_opt_strs+4602) +#define zExplain (certtool_opt_strs+4621) +#define zDetail (certtool_opt_strs+4624) +#define zFullVersion (certtool_opt_strs+4798) +/* extracted from optcode.tlib near line 353 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT @@ -1807,8 +1571,10 @@ static tOptDesc optDesc[OPTION_CT] = { # define translate_option_strings NULL #endif /* ENABLE_NLS */ + #define certtool_full_usage (NULL) -#define certtool_short_usage (certtool_opt_strs+4803) + +#define certtool_short_usage (certtool_opt_strs+4817) #endif /* not defined __doxygen__ */ @@ -1818,8 +1584,8 @@ static tOptDesc optDesc[OPTION_CT] = { /** * The callout function that invokes the optionUsage function. * - * @param[in] pOptions the AutoOpts option description structure - * @param[in] pOptDesc the descriptor for the "help" (usage) option. + * @param pOptions the AutoOpts option description structure + * @param pOptDesc the descriptor for the "help" (usage) option. * @noreturn */ static void @@ -1834,9 +1600,9 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** * Code to handle the debug option. - * Specifies the debug level. - * @param[in] pOptions the certtool options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * + * @param pOptions the certtool options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1870,8 +1636,8 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc) /** * Code to handle the infile option. * - * @param[in] pOptions the certtool options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * @param pOptions the certtool options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptInfile(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1894,8 +1660,8 @@ doOptInfile(tOptions* pOptions, tOptDesc* pOptDesc) /** * Code to handle the load-request option. * - * @param[in] pOptions the certtool options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * @param pOptions the certtool options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptLoad_Request(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1918,8 +1684,8 @@ doOptLoad_Request(tOptions* pOptions, tOptDesc* pOptDesc) /** * Code to handle the ecdsa option. * - * @param[in] pOptions the certtool options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * @param pOptions the certtool options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptEcdsa(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1934,8 +1700,8 @@ doOptEcdsa(tOptions* pOptions, tOptDesc* pOptDesc) /** * Code to handle the inraw option. * - * @param[in] pOptions the certtool options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * @param pOptions the certtool options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptInraw(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1950,8 +1716,8 @@ doOptInraw(tOptions* pOptions, tOptDesc* pOptDesc) /** * Code to handle the outraw option. * - * @param[in] pOptions the certtool options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * @param pOptions the certtool options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptOutraw(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1966,8 +1732,8 @@ doOptOutraw(tOptions* pOptions, tOptDesc* pOptDesc) /** * Code to handle the template option. * - * @param[in] pOptions the certtool options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * @param pOptions the certtool options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptTemplate(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1985,7 +1751,7 @@ doOptTemplate(tOptions* pOptions, tOptDesc* pOptDesc) */ optionFileCheck(pOptions, pOptDesc, type, mode); } -/* extracted from optmain.tlib near line 1254 */ +/* extracted from optmain.tlib near line 1188 */ /** * The directory containing the data associated with certtool. @@ -2001,7 +1767,6 @@ doOptTemplate(tOptions* pOptions, tOptDesc* pOptDesc) #ifndef WITH_PACKAGER # define certtool_packager_info NULL #else -/** Packager information for certtool. */ static char const certtool_packager_info[] = "Packaged by " WITH_PACKAGER @@ -2057,11 +1822,6 @@ tOptions certtoolOptions = { }; #if ENABLE_NLS -/** - * This code is designed to translate translatable option text for the - * certtool program. These translations happen upon entry - * to optionProcess(). - */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -2140,8 +1900,9 @@ translate_option_strings(void) * Do the translations. The first pointer follows the field count * field. The field count field is the size of a pointer. */ - char ** ppz = (char**)(void*)&(option_xlateable_txt); - int ix = option_xlateable_txt.field_ct; + tOptDesc * od = opts->pOptDesc; + char ** ppz = (char**)(void*)&(option_xlateable_txt); + int ix = option_xlateable_txt.field_ct; do { ppz++; /* skip over field_ct */ @@ -2156,550 +1917,28 @@ translate_option_strings(void) coerce_it((void*)&(opts->pzUsageTitle)); coerce_it((void*)&(opts->pzExplain)); coerce_it((void*)&(opts->pzDetail)); - { - tOptDesc * od = opts->pOptDesc; - for (ix = opts->optCt; ix > 0; ix--, od++) - coerce_it((void*)&(od->pzText)); - } - } -} -#endif /* ENABLE_NLS */ - -#ifdef DO_NOT_COMPILE_THIS_CODE_IT_IS_FOR_GETTEXT -/** I18N function strictly for xgettext. Do not compile. */ -static void bogus_function(void) { - /* TRANSLATORS: - - The following dummy function was crated solely so that xgettext can extract - the correct strings. These strings are actually referenced by a field name - in the certtoolOptions structure noted in the comments below. The - literal text is defined in certtool_opt_strs. - - NOTE: the strings below are segmented with respect to the source string - certtool_opt_strs. The strings above are handed off for translation - at run time a paragraph at a time. Consequently, they are presented here - for translation a paragraph at a time. - - ALSO: often the description for an option will reference another option - by name. These are set off with apostrophe quotes (I hope). Do not - translate option names. - */ - /* referenced via certtoolOptions.pzCopyright */ - puts(_("certtool @VERSION@\n\ -Copyright (C) 2000-2012 Free Software Foundation, all rights reserved.\n\ -This is free software. It is licensed for use, modification and\n\ -redistribution under the terms of the GNU General Public License,\n\ -version 3 or later <http://gnu.org/licenses/gpl.html>\n")); - - /* referenced via certtoolOptions.pzCopyNotice */ - puts(_("certtool is free software: you can redistribute it and/or modify it under\n\ -the terms of the GNU General Public License as published by the Free\n\ -Software Foundation, either version 3 of the License, or (at your option)\n\ -any later version.\n\n")); - puts(_("certtool is distributed in the hope that it will be useful, but WITHOUT ANY\n\ -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n\ -FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\n\ -details.\n\n")); - puts(_("You should have received a copy of the GNU General Public License along\n\ -with this program. If not, see <http://www.gnu.org/licenses/>.\n")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Enable debugging.")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("More verbose output")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Input file")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Output file")); + coerce_it((void*)&(opts->pzPackager)); + coerce_it((void*)&(opts->pzShortUsage)); - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generate a self-signed certificate")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generate a signed certificate")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generates a proxy certificate")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generate a CRL")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Update a signed certificate")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generate a private key")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generate a PKCS #10 certificate request")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Verify a PEM encoded certificate chain.")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Verify a PEM encoded certificate chain using a trusted list.")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Verify a CRL using a trusted list.")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generate PKCS #3 encoded Diffie-Hellman parameters.")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Get the included PKCS #3 encoded Diffie-Hellman parameters.")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information PKCS #3 encoded Diffie-Hellman parameters")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Loads a private key file")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Loads a public key file")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Loads a certificate request file")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Loads a certificate file")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Loads the certificate authority's private key file")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Loads the certificate authority's certificate file")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Password to use")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print big number in an easier format to parse")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("In certain operations it prints the information is C-friendly format")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Enforce a NULL password")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on the given certificate")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print certificate's public key")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on the given OpenPGP certificate")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on the given OpenPGP keyring structure")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on the given CRL structure")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on the given certificate request")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Do not use extensions in certificate requests")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on a PKCS #12 structure")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on a PKCS #7 structure")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Convert S/MIME to PKCS #7 structure")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on a private key")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on an OpenPGP private key")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on a public key")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generate an X.509 version 1 certificate (with no extensions)")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generate a PKCS #12 structure")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generate a PKCS #8 structure")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Use PKCS #8 format for private keys")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generate RSA key")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generate DSA key")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Generate ECC (ECDSA) key")); + for (ix = opts->optCt; ix > 0; ix--, od++) + coerce_it((void*)&(od->pzText)); + } - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("an alias for the 'ecc' option")); + if ((opts->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) { + tOptDesc * od = opts->pOptDesc; + int ix; - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Hash algorithm to use for signing.")); + for (ix = opts->optCt; ix > 0; ix--, od++) { + coerce_it((void*)&(od->pz_Name)); + coerce_it((void*)&(od->pz_DisableName)); + coerce_it((void*)&(od->pz_DisablePfx)); + } + certtoolOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT; + } +} - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Use DER format for input certificates and private keys.")); +#endif /* ENABLE_NLS */ - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("an alias for the 'inder' option")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Use DER format for output certificates and private keys")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("an alias for the 'outder' option")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Specify the number of bits for key generate")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Specify the security level [low, legacy, normal, high, ultra].")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("No effect")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Template file to use for non-interactive operation")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Cipher to use for PKCS #8 and #12 operations")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("display extended usage information and exit")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("extended usage information passed thru pager")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("output version information and exit")); - - /* referenced via certtoolOptions.pzUsageTitle */ - puts(_("certtool - GnuTLS certificate tool\n\ -Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n")); - - /* referenced via certtoolOptions.pzExplain */ - puts(_("\n")); - - /* referenced via certtoolOptions.pzDetail */ - puts(_("Tool to parse and generate X.509 certificates, requests and private keys.\n\ -It can be used interactively or non interactively by specifying the\n\ -template command line option.\n")); - - /* referenced via certtoolOptions.pzFullVersion */ - puts(_("certtool @VERSION@")); - - /* referenced via certtoolOptions.pzFullUsage */ - puts(_("<<<NOT-FOUND>>>")); - - /* referenced via certtoolOptions.pzShortUsage */ - puts(_("certtool [options]\n\ -certtool --help for usage instructions.\n")); - /* LIBOPTS-MESSAGES: */ -#line 60 "../autoopts.c" - puts(_("allocation of %d bytes failed\n")); -#line 86 "../autoopts.c" - puts(_("allocation of %d bytes failed\n")); -#line 53 "../init.c" - puts(_("AutoOpts function called without option descriptor\n")); -#line 89 "../init.c" - puts(_("\tThis exceeds the compiled library version: ")); -#line 87 "../init.c" - puts(_("Automated Options Processing Error!\n" - "\t%s called AutoOpts function with structure version %d:%d:%d.\n")); -#line 73 "../autoopts.c" - puts(_("realloc of %d bytes at 0x%p failed\n")); -#line 91 "../init.c" - puts(_("\tThis is less than the minimum library version: ")); -#line 121 "../version.c" - puts(_("Automated Options version %s\n" - "\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n")); -#line 310 "../usage.c" - puts(_("(AutoOpts bug): %s.\n")); -#line 90 "../reset.c" - puts(_("optionResetOpt() called, but reset-option not configured")); -#line 329 "../usage.c" - puts(_("could not locate the 'help' option")); -#line 351 "../autoopts.c" - puts(_("optionProcess() was called with invalid data")); -#line 783 "../usage.c" - puts(_("invalid argument type specified")); -#line 589 "../find.c" - puts(_("defaulted to option with optional arg")); -#line 76 "../alias.c" - puts(_("aliasing option is out of range.")); -#line 229 "../enum.c" - puts(_("%s error: the keyword '%s' is ambiguous for %s\n")); -#line 108 "../find.c" - puts(_(" The following options match:\n")); -#line 290 "../find.c" - puts(_("%s: ambiguous option name: %s (matches %d options)\n")); -#line 161 "../check.c" - puts(_("%s: Command line arguments required\n")); -#line 43 "../alias.c" - puts(_("%d %s%s options allowed\n")); -#line 81 "../makeshell.c" - puts(_("%s error %d (%s) calling %s for '%s'\n")); -#line 293 "../makeshell.c" - puts(_("interprocess pipe")); -#line 168 "../version.c" - puts(_("error: version option argument '%c' invalid. Use:\n" - "\t'v' - version only\n" - "\t'c' - version and copyright\n" - "\t'n' - version and full copyright notice\n")); -#line 58 "../check.c" - puts(_("%s error: the '%s' and '%s' options conflict\n")); -#line 214 "../find.c" - puts(_("%s: The '%s' option has been disabled.")); -#line 421 "../find.c" - puts(_("%s: The '%s' option has been disabled.")); -#line 38 "../alias.c" - puts(_("-equivalence")); -#line 460 "../find.c" - puts(_("%s: illegal option -- %c\n")); -#line 110 "../reset.c" - puts(_("%s: illegal option -- %c\n")); -#line 268 "../find.c" - puts(_("%s: illegal option -- %s\n")); -#line 746 "../find.c" - puts(_("%s: illegal option -- %s\n")); -#line 118 "../reset.c" - puts(_("%s: illegal option -- %s\n")); -#line 332 "../find.c" - puts(_("%s: unknown vendor extension option -- %s\n")); -#line 154 "../enum.c" - puts(_(" or an integer from %d through %d\n")); -#line 164 "../enum.c" - puts(_(" or an integer from %d through %d\n")); -#line 782 "../usage.c" - puts(_("%s error: invalid option descriptor for %s\n")); -#line 1110 "../usage.c" - puts(_("%s error: invalid option descriptor for %s\n")); -#line 379 "../find.c" - puts(_("%s: invalid option name: %s\n")); -#line 518 "../find.c" - puts(_("%s: The '%s' option requires an argument.\n")); -#line 171 "../autoopts.c" - puts(_("(AutoOpts bug): Equivalenced option '%s' was equivalenced to both\n" - "\t'%s' and '%s'.")); -#line 94 "../check.c" - puts(_("%s error: The %s option is required\n")); -#line 623 "../find.c" - puts(_("%s: The '%s' option cannot have an argument.\n")); -#line 151 "../check.c" - puts(_("%s: Command line arguments are not allowed.\n")); -#line 531 "../save.c" - puts(_("error %d (%s) creating %s\n")); -#line 229 "../enum.c" - puts(_("%s error: '%s' does not match any %s keywords.\n")); -#line 93 "../reset.c" - puts(_("%s error: The '%s' option requires an argument.\n")); -#line 184 "../save.c" - puts(_("error %d (%s) stat-ing %s\n")); -#line 238 "../save.c" - puts(_("error %d (%s) stat-ing %s\n")); -#line 143 "../restore.c" - puts(_("%s error: no saved option state\n")); -#line 246 "../autoopts.c" - puts(_("'%s' is not a command line option.\n")); -#line 114 "../time.c" - puts(_("%s error: '%s' is not a recognizable date/time.\n")); -#line 132 "../save.c" - puts(_("'%s' not defined\n")); -#line 53 "../time.c" - puts(_("%s error: '%s' is not a recognizable time duration.\n")); -#line 92 "../check.c" - puts(_("%s error: The %s option must appear %d times.\n")); -#line 157 "../numeric.c" - puts(_("%s error: '%s' is not a recognizable number.\n")); -#line 195 "../enum.c" - puts(_("%s error: %s exceeds %s keyword count\n")); -#line 366 "../usage.c" - puts(_("Try '%s %s' for more information.\n")); -#line 45 "../alias.c" - puts(_("one %s%s option allowed\n")); -#line 195 "../makeshell.c" - puts(_("standard output")); -#line 930 "../makeshell.c" - puts(_("standard output")); -#line 304 "../usage.c" - puts(_("standard output")); -#line 451 "../usage.c" - puts(_("standard output")); -#line 660 "../usage.c" - puts(_("standard output")); -#line 175 "../version.c" - puts(_("standard output")); -#line 304 "../usage.c" - puts(_("standard error")); -#line 451 "../usage.c" - puts(_("standard error")); -#line 660 "../usage.c" - puts(_("standard error")); -#line 175 "../version.c" - puts(_("standard error")); -#line 195 "../makeshell.c" - puts(_("write")); -#line 930 "../makeshell.c" - puts(_("write")); -#line 303 "../usage.c" - puts(_("write")); -#line 450 "../usage.c" - puts(_("write")); -#line 659 "../usage.c" - puts(_("write")); -#line 174 "../version.c" - puts(_("write")); -#line 60 "../numeric.c" - puts(_("%s error: %s option value %ld is out of range.\n")); -#line 44 "../check.c" - puts(_("%s error: %s option requires the %s option\n")); -#line 131 "../save.c" - puts(_("%s warning: cannot save options - %s not regular file\n")); -#line 183 "../save.c" - puts(_("%s warning: cannot save options - %s not regular file\n")); -#line 237 "../save.c" - puts(_("%s warning: cannot save options - %s not regular file\n")); -#line 256 "../save.c" - puts(_("%s warning: cannot save options - %s not regular file\n")); -#line 530 "../save.c" - puts(_("%s warning: cannot save options - %s not regular file\n")); - /* END-LIBOPTS-MESSAGES */ - - /* USAGE-TEXT: */ -#line 908 "../usage.c" - puts(_("\t\t\t\t- an alternate for '%s'\n")); -#line 1177 "../usage.c" - puts(_("Version, usage and configuration options:")); -#line 959 "../usage.c" - puts(_("\t\t\t\t- default option for unnamed options\n")); -#line 872 "../usage.c" - puts(_("\t\t\t\t- disabled as '--%s'\n")); -#line 1146 "../usage.c" - puts(_(" --- %-14s %s\n")); -#line 1144 "../usage.c" - puts(_("This option has been disabled")); -#line 899 "../usage.c" - puts(_("\t\t\t\t- enabled by default\n")); -#line 40 "../alias.c" - puts(_("%s error: only ")); -#line 1221 "../usage.c" - puts(_(" - examining environment variables named %s_*\n")); -#line 168 "../file.c" - puts(_("\t\t\t\t- file must not pre-exist\n")); -#line 172 "../file.c" - puts(_("\t\t\t\t- file must pre-exist\n")); -#line 416 "../usage.c" - puts(_("Options are specified by doubled hyphens and their name or by a single\n" - "hyphen and the flag character.\n")); -#line 908 "../makeshell.c" - puts(_("\n" - "= = = = = = = =\n\n" - "This incarnation of genshell will produce\n" - "a shell script to parse the options for %s:\n\n")); -#line 161 "../enum.c" - puts(_(" or an integer mask with any of the lower %d bits set\n")); -#line 932 "../usage.c" - puts(_("\t\t\t\t- is a set membership option\n")); -#line 953 "../usage.c" - puts(_("\t\t\t\t- must appear between %d and %d times\n")); -#line 418 "../usage.c" - puts(_("Options are specified by single or double hyphens and their name.\n")); -#line 939 "../usage.c" - puts(_("\t\t\t\t- may appear multiple times\n")); -#line 926 "../usage.c" - puts(_("\t\t\t\t- may not be preset\n")); -#line 1336 "../usage.c" - puts(_(" Arg Option-Name Description\n")); -#line 1272 "../usage.c" - puts(_(" Flg Arg Option-Name Description\n")); -#line 1330 "../usage.c" - puts(_(" Flg Arg Option-Name Description\n")); -#line 1331 "../usage.c" - puts(_(" %3s %s")); -#line 1337 "../usage.c" - puts(_(" %3s %s")); -#line 423 "../usage.c" - puts(_("The '-#<number>' option may omit the hash char\n")); -#line 419 "../usage.c" - puts(_("All arguments are named options.\n")); -#line 1006 "../usage.c" - puts(_(" - reading file %s")); -#line 445 "../usage.c" - puts(_("\n" - "Please send bug reports to: <%s>\n")); -#line 100 "../version.c" - puts(_("\n" - "Please send bug reports to: <%s>\n")); -#line 129 "../version.c" - puts(_("\n" - "Please send bug reports to: <%s>\n")); -#line 938 "../usage.c" - puts(_("\t\t\t\t- may NOT appear - preset only\n")); -#line 978 "../usage.c" - puts(_("\n" - "The following option preset mechanisms are supported:\n")); -#line 1219 "../usage.c" - puts(_("\n" - "The following option preset mechanisms are supported:\n")); -#line 717 "../usage.c" - puts(_("prohibits these options:\n")); -#line 712 "../usage.c" - puts(_("prohibits the option '%s'\n")); -#line 81 "../numeric.c" - puts(_("%s%ld to %ld")); -#line 79 "../numeric.c" - puts(_("%sgreater than or equal to %ld")); -#line 75 "../numeric.c" - puts(_("%s%ld exactly")); -#line 68 "../numeric.c" - puts(_("%sit must lie in one of the ranges:\n")); -#line 68 "../numeric.c" - puts(_("%sit must be in the range:\n")); -#line 88 "../numeric.c" - puts(_(", or\n")); -#line 66 "../numeric.c" - puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n")); -#line 77 "../numeric.c" - puts(_("%sless than or equal to %ld")); -#line 426 "../usage.c" - puts(_("Operands and options may be intermixed. They will be reordered.\n")); -#line 687 "../usage.c" - puts(_("requires the option '%s'\n")); -#line 690 "../usage.c" - puts(_("requires these options:\n")); -#line 1348 "../usage.c" - puts(_(" Arg Option-Name Req? Description\n")); -#line 1342 "../usage.c" - puts(_(" Flg Arg Option-Name Req? Description\n")); -#line 162 "../enum.c" - puts(_("or you may use a numeric representation. Preceding these with a '!'\n" - "will clear the bits, specifying 'none' will clear all bits, and 'all'\n" - "will set them all. Multiple entries may be passed as an option\n" - "argument list.\n")); -#line 945 "../usage.c" - puts(_("\t\t\t\t- may appear up to %d times\n")); -#line 72 "../enum.c" - puts(_("The valid \"%s\" option keywords are:\n")); -#line 1181 "../usage.c" - puts(_("The next option supports vendor supported extra options:")); -#line 808 "../usage.c" - puts(_("These additional options are:")); - /* END-USAGE-TEXT */ -} -#endif /* uncompilable code */ #ifdef __cplusplus } #endif diff --git a/src/certtool-args.def b/src/certtool-args.def index 50d8a41e13..c99da8947f 100644 --- a/src/certtool-args.def +++ b/src/certtool-args.def @@ -514,8 +514,8 @@ certtool. Initially create a file named 'cert.cfg' that contains the information about the certificate. The template can be used as below: @example -$ certtool --generate-certificate cert.pem --load-privkey key.pem \ - --template cert.cfg \ +$ certtool --generate-certificate --load-privkey key.pem \ + --template cert.cfg --outfile cert.pem \ --load-ca-certificate ca-cert.pem --load-ca-privkey ca-key.pem @end example diff --git a/src/certtool-args.h b/src/certtool-args.h index 86c1ba7a2c..419553cb71 100644 --- a/src/certtool-args.h +++ b/src/certtool-args.h @@ -1,12 +1,12 @@ /* -*- buffer-read-only: t -*- vi: set ro: - * + * * DO NOT EDIT THIS FILE (certtool-args.h) - * - * It has been AutoGen-ed May 5, 2013 at 12:48:28 PM by AutoGen 5.17.3 + * + * It has been AutoGen-ed October 31, 2013 at 10:37:31 AM by AutoGen 5.17 * From the definitions certtool-args.def * and the template file options * - * Generated from AutoOpts 38:0:13 templates. + * Generated from AutoOpts 37:0:12 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -21,23 +21,24 @@ * * Copyright (C) 2000-2012 Free Software Foundation, all rights reserved. * This is free software. It is licensed for use, modification and - * redistribution under the terms of the GNU General Public License, - * version 3 or later <http://gnu.org/licenses/gpl.html> + * redistribution under the terms of the + * GNU General Public License, version 3 or later + * <http://gnu.org/licenses/gpl.html> * * certtool is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * certtool is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. */ -/** +/* * This file contains the programmatic interface to the Automated * Options generated for the certtool program. * These macros are documented in the AutoGen info file in the @@ -48,22 +49,22 @@ #include "config.h" #include <autoopts/options.h> -/** +/* * Ensure that the library used for compiling this generated header is at * least as new as the version current when the header template was released * (not counting patch version increments). Also ensure that the oldest * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 155648 +#define AO_TEMPLATE_VERSION 151552 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header Choke Me. #endif -/** - * Enumeration of each option type for certtool +/* + * Enumeration of each option: */ typedef enum { INDEX_OPT_DEBUG = 0, @@ -128,51 +129,34 @@ typedef enum { INDEX_OPT_HELP = 59, INDEX_OPT_MORE_HELP = 60 } teOptIndex; -/** count of all options for certtool */ + #define OPTION_CT 61 -/** certtool version */ #define CERTTOOL_VERSION "@VERSION@" -/** Full certtool version text */ #define CERTTOOL_FULL_VERSION "certtool @VERSION@" -/** +/* * Interface defines for all options. Replace "n" with the UPPER_CASED * option name (as in the teOptIndex enumeration above). * e.g. HAVE_OPT(DEBUG) */ #define DESC(n) (certtoolOptions.pOptDesc[INDEX_OPT_## n]) -/** 'true' if an option has been specified in any way */ #define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) -/** The string argument to an option. The argument type must be "string". */ #define OPT_ARG(n) (DESC(n).optArg.argString) -/** Mask the option state revealing how an option was specified. - * It will be one and only one of \a OPTST_SET, \a OPTST_PRESET, - * \a OPTST_DEFINED, \a OPTST_RESET or zero. - */ #define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) -/** Count of option's occurrances *on the command line*. */ #define COUNT_OPT(n) (DESC(n).optOccCt) -/** mask of \a OPTST_SET and \a OPTST_DEFINED. */ #define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) -/** 'true' if \a HAVE_OPT would yield 'false'. */ #define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) -/** 'true' if OPTST_DISABLED bit not set. */ #define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) -/** number of stacked option arguments. - * Valid only for stacked option arguments. */ #define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) -/** stacked argument vector. - * Valid only for stacked option arguments. */ #define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) -/** Reset an option. */ #define CLEAR_OPT(n) STMTS( \ DESC(n).fOptState &= OPTST_PERSISTENT_MASK; \ if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \ DESC(n).fOptState |= OPTST_DISABLED; \ DESC(n).optCookie = NULL ) -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/** +/* * * * * * + * * Enumeration of certtool exit codes */ typedef enum { @@ -181,10 +165,9 @@ typedef enum { CERTTOOL_EXIT_USAGE_ERROR = 64, CERTTOOL_EXIT_LIBOPTS_FAILURE = 70 } certtool_exit_code_t; -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/** +/* * * * * * + * * Interface defines for specific options. - * @{ */ #define VALUE_OPT_DEBUG 'd' @@ -248,11 +231,8 @@ typedef enum { #define VALUE_OPT_DISABLE_QUICK_RANDOM 151 #define VALUE_OPT_TEMPLATE 152 #define VALUE_OPT_PKCS_CIPHER 153 -/** option flag (value) for " (get "val-name") " option */ #define VALUE_OPT_HELP 'h' -/** option flag (value) for " (get "val-name") " option */ #define VALUE_OPT_MORE_HELP '!' -/** option flag (value) for " (get "val-name") " option */ #define VALUE_OPT_VERSION 'v' /* * Interface defines not associated with particular options @@ -264,7 +244,7 @@ typedef enum { certtoolOptions.pzCurOpt = NULL) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*certtoolOptions.pUsageProc)(&certtoolOptions, c) -/* extracted from opthead.tlib near line 538 */ +/* extracted from opthead.tlib near line 497 */ #ifdef __cplusplus extern "C" { |