summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2013-05-29 19:52:33 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2013-05-29 19:56:48 +0200
commit9ce0ece253003ffc43442e4f96674407602b8d15 (patch)
tree0e23bc42409739cd0dbbd007f3125d4f00820153 /src
parentd2acb6fce1b7bff0383cb6e1fd69f73f5631986d (diff)
downloadgnutls-9ce0ece253003ffc43442e4f96674407602b8d15.tar.gz
updated libopts' generated files
Diffstat (limited to 'src')
-rw-r--r--src/certtool-args.c1853
-rw-r--r--src/certtool-args.h75
-rw-r--r--src/cli-args.c1585
-rw-r--r--src/cli-args.h73
-rw-r--r--src/cli-debug-args.c670
-rw-r--r--src/cli-debug-args.h73
-rw-r--r--src/danetool-args.c1103
-rw-r--r--src/danetool-args.h75
-rw-r--r--src/ocsptool-args.c1015
-rw-r--r--src/ocsptool-args.h75
-rw-r--r--src/p11tool-args.c1299
-rw-r--r--src/p11tool-args.h75
-rw-r--r--src/psk-args.c687
-rw-r--r--src/psk-args.h75
-rw-r--r--src/serv-args.c1398
-rw-r--r--src/serv-args.h73
-rw-r--r--src/srptool-args.c766
-rw-r--r--src/srptool-args.h75
18 files changed, 8153 insertions, 2892 deletions
diff --git a/src/certtool-args.c b/src/certtool-args.c
index d8c6b5c109..5bfe1c2d87 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 March 7, 2013 at 02:51:43 AM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:18 PM by AutoGen 5.17.3
* From the definitions certtool-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This source file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,20 +21,19 @@
*
* 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/>.
*/
@@ -53,28 +52,24 @@
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+279)
+#define zLicenseDescrip (certtool_opt_strs+275)
#ifndef NULL
# define NULL 0
#endif
-/*
- * certtool option static const strings
+/**
+ * static const strings for certtool options
*/
-static char const certtool_opt_strs[4877] =
+static char const certtool_opt_strs[4863] =
/* 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\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"
+ "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"
"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"
@@ -84,700 +79,936 @@ static char const certtool_opt_strs[4877] =
"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"
-/* 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"
+/* 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"
"It can be used interactively or non interactively by specifying the\n"
"template command line option.\n\0"
-/* 4798 */ "certtool @VERSION@\0"
-/* 4817 */ "certtool [options]\n"
+/* 4784 */ "certtool @VERSION@\0"
+/* 4803 */ "certtool [options]\n"
"certtool --help for usage instructions.\n";
-/*
+/**
* debug option description:
*/
-#define DEBUG_DESC (certtool_opt_strs+884)
-#define DEBUG_NAME (certtool_opt_strs+902)
-#define DEBUG_name (certtool_opt_strs+908)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* verbose option description:
*/
-#define VERBOSE_DESC (certtool_opt_strs+914)
-#define VERBOSE_NAME (certtool_opt_strs+934)
-#define VERBOSE_name (certtool_opt_strs+942)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* infile option description:
*/
-#define INFILE_DESC (certtool_opt_strs+950)
-#define INFILE_NAME (certtool_opt_strs+961)
-#define INFILE_name (certtool_opt_strs+968)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* outfile option description:
*/
-#define OUTFILE_DESC (certtool_opt_strs+975)
-#define OUTFILE_NAME (certtool_opt_strs+987)
-#define OUTFILE_name (certtool_opt_strs+995)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* generate-self-signed option description:
*/
-#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)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* generate-certificate option description:
*/
-#define GENERATE_CERTIFICATE_DESC (certtool_opt_strs+1080)
-#define GENERATE_CERTIFICATE_NAME (certtool_opt_strs+1110)
-#define GENERATE_CERTIFICATE_name (certtool_opt_strs+1131)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* generate-proxy option description:
*/
-#define GENERATE_PROXY_DESC (certtool_opt_strs+1152)
-#define GENERATE_PROXY_NAME (certtool_opt_strs+1182)
-#define GENERATE_PROXY_name (certtool_opt_strs+1197)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* generate-crl option description:
*/
-#define GENERATE_CRL_DESC (certtool_opt_strs+1212)
-#define GENERATE_CRL_NAME (certtool_opt_strs+1227)
-#define GENERATE_CRL_name (certtool_opt_strs+1240)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* update-certificate option description:
*/
-#define UPDATE_CERTIFICATE_DESC (certtool_opt_strs+1253)
-#define UPDATE_CERTIFICATE_NAME (certtool_opt_strs+1281)
-#define UPDATE_CERTIFICATE_name (certtool_opt_strs+1300)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* generate-privkey option description:
*/
-#define GENERATE_PRIVKEY_DESC (certtool_opt_strs+1319)
-#define GENERATE_PRIVKEY_NAME (certtool_opt_strs+1342)
-#define GENERATE_PRIVKEY_name (certtool_opt_strs+1359)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* generate-request option description with
* "Must also have options" and "Incompatible options":
*/
-#define GENERATE_REQUEST_DESC (certtool_opt_strs+1376)
-#define GENERATE_REQUEST_NAME (certtool_opt_strs+1416)
-#define GENERATE_REQUEST_name (certtool_opt_strs+1433)
+/** 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 */
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:
*/
-#define VERIFY_CHAIN_DESC (certtool_opt_strs+1450)
-#define VERIFY_CHAIN_NAME (certtool_opt_strs+1490)
-#define VERIFY_CHAIN_name (certtool_opt_strs+1503)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* verify option description with
* "Must also have options" and "Incompatible options":
*/
-#define VERIFY_DESC (certtool_opt_strs+1516)
-#define VERIFY_NAME (certtool_opt_strs+1577)
-#define VERIFY_name (certtool_opt_strs+1584)
+/** 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 */
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":
*/
-#define VERIFY_CRL_DESC (certtool_opt_strs+1591)
-#define VERIFY_CRL_NAME (certtool_opt_strs+1626)
-#define VERIFY_CRL_name (certtool_opt_strs+1637)
+/** 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 */
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:
*/
-#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)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* get-dh-params option description:
*/
-#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)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* dh-info option description:
*/
-#define DH_INFO_DESC (certtool_opt_strs+1826)
-#define DH_INFO_NAME (certtool_opt_strs+1886)
-#define DH_INFO_name (certtool_opt_strs+1894)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* load-privkey option description:
*/
-#define LOAD_PRIVKEY_DESC (certtool_opt_strs+1902)
-#define LOAD_PRIVKEY_NAME (certtool_opt_strs+1927)
-#define LOAD_PRIVKEY_name (certtool_opt_strs+1940)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* load-pubkey option description:
*/
-#define LOAD_PUBKEY_DESC (certtool_opt_strs+1953)
-#define LOAD_PUBKEY_NAME (certtool_opt_strs+1977)
-#define LOAD_PUBKEY_name (certtool_opt_strs+1989)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* load-request option description:
*/
-#define LOAD_REQUEST_DESC (certtool_opt_strs+2001)
-#define LOAD_REQUEST_NAME (certtool_opt_strs+2034)
-#define LOAD_REQUEST_name (certtool_opt_strs+2047)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* load-certificate option description:
*/
-#define LOAD_CERTIFICATE_DESC (certtool_opt_strs+2060)
-#define LOAD_CERTIFICATE_NAME (certtool_opt_strs+2085)
-#define LOAD_CERTIFICATE_name (certtool_opt_strs+2102)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* load-ca-privkey option description:
*/
-#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)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* load-ca-certificate option description:
*/
-#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)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* password option description:
*/
-#define PASSWORD_DESC (certtool_opt_strs+2293)
-#define PASSWORD_NAME (certtool_opt_strs+2309)
-#define PASSWORD_name (certtool_opt_strs+2318)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* hex-numbers option description:
*/
-#define HEX_NUMBERS_DESC (certtool_opt_strs+2327)
-#define HEX_NUMBERS_NAME (certtool_opt_strs+2373)
-#define HEX_NUMBERS_name (certtool_opt_strs+2385)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* cprint option description:
*/
-#define CPRINT_DESC (certtool_opt_strs+2397)
-#define CPRINT_NAME (certtool_opt_strs+2466)
-#define CPRINT_name (certtool_opt_strs+2473)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* null-password option description:
*/
-#define NULL_PASSWORD_DESC (certtool_opt_strs+2480)
-#define NULL_PASSWORD_NAME (certtool_opt_strs+2504)
-#define NULL_PASSWORD_name (certtool_opt_strs+2518)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* certificate-info option description:
*/
-#define CERTIFICATE_INFO_DESC (certtool_opt_strs+2532)
-#define CERTIFICATE_INFO_NAME (certtool_opt_strs+2575)
-#define CERTIFICATE_INFO_name (certtool_opt_strs+2592)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* certificate-pubkey option description:
*/
-#define CERTIFICATE_PUBKEY_DESC (certtool_opt_strs+2609)
-#define CERTIFICATE_PUBKEY_NAME (certtool_opt_strs+2640)
-#define CERTIFICATE_PUBKEY_name (certtool_opt_strs+2659)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* pgp-certificate-info option description:
*/
-#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)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* pgp-ring-info option description:
*/
-#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)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* crl-info option description:
*/
-#define CRL_INFO_DESC (certtool_opt_strs+2856)
-#define CRL_INFO_NAME (certtool_opt_strs+2901)
-#define CRL_INFO_name (certtool_opt_strs+2910)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* crq-info option description:
*/
-#define CRQ_INFO_DESC (certtool_opt_strs+2919)
-#define CRQ_INFO_NAME (certtool_opt_strs+2970)
-#define CRQ_INFO_name (certtool_opt_strs+2979)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* no-crq-extensions option description:
*/
-#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)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* p12-info option description:
*/
-#define P12_INFO_DESC (certtool_opt_strs+3070)
-#define P12_INFO_NAME (certtool_opt_strs+3112)
-#define P12_INFO_name (certtool_opt_strs+3121)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* p7-info option description:
*/
-#define P7_INFO_DESC (certtool_opt_strs+3130)
-#define P7_INFO_NAME (certtool_opt_strs+3171)
-#define P7_INFO_name (certtool_opt_strs+3179)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* smime-to-p7 option description:
*/
-#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)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* key-info option description:
*/
-#define KEY_INFO_DESC (certtool_opt_strs+3247)
-#define KEY_INFO_NAME (certtool_opt_strs+3282)
-#define KEY_INFO_name (certtool_opt_strs+3291)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* pgp-key-info option description:
*/
-#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)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* pubkey-info option description:
*/
-#define PUBKEY_INFO_DESC (certtool_opt_strs+3370)
-#define PUBKEY_INFO_NAME (certtool_opt_strs+3404)
-#define PUBKEY_INFO_name (certtool_opt_strs+3416)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* v1 option description:
*/
-#define V1_DESC (certtool_opt_strs+3428)
-#define V1_NAME (certtool_opt_strs+3489)
-#define V1_name (certtool_opt_strs+3492)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* to-p12 option description with
* "Must also have options" and "Incompatible options":
*/
-#define TO_P12_DESC (certtool_opt_strs+3495)
-#define TO_P12_NAME (certtool_opt_strs+3525)
-#define TO_P12_name (certtool_opt_strs+3532)
+/** 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 */
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:
*/
-#define TO_P8_DESC (certtool_opt_strs+3539)
-#define TO_P8_NAME (certtool_opt_strs+3568)
-#define TO_P8_name (certtool_opt_strs+3574)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* pkcs8 option description:
*/
-#define PKCS8_DESC (certtool_opt_strs+3580)
-#define PKCS8_NAME (certtool_opt_strs+3616)
-#define PKCS8_name (certtool_opt_strs+3622)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* rsa option description:
*/
-#define RSA_DESC (certtool_opt_strs+3628)
-#define RSA_NAME (certtool_opt_strs+3645)
-#define RSA_name (certtool_opt_strs+3649)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* dsa option description:
*/
-#define DSA_DESC (certtool_opt_strs+3653)
-#define DSA_NAME (certtool_opt_strs+3670)
-#define DSA_name (certtool_opt_strs+3674)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* ecc option description:
*/
-#define ECC_DESC (certtool_opt_strs+3678)
-#define ECC_NAME (certtool_opt_strs+3703)
-#define ECC_name (certtool_opt_strs+3707)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* ecdsa option description:
*/
-#define ECDSA_DESC (certtool_opt_strs+3711)
+/** Descriptive text for the ecdsa option */
+#define ECDSA_DESC (certtool_opt_strs+3707)
#define ECDSA_NAME NULL
-#define ECDSA_name (certtool_opt_strs+3738)
+/** Unmodified name string for the ecdsa option */
+#define ECDSA_name (certtool_opt_strs+3737)
+/** Compiled in flag settings for the ecdsa option */
#define ECDSA_FLAGS (ECC_FLAGS | OPTST_ALIAS)
-/*
+/**
* hash option description:
*/
-#define HASH_DESC (certtool_opt_strs+3744)
-#define HASH_NAME (certtool_opt_strs+3779)
-#define HASH_name (certtool_opt_strs+3784)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* inder option description:
*/
-#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)
+/** 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_name (NOT_INDER_name + 3)
+/** Compiled in flag settings for the inder option */
#define INDER_FLAGS (OPTST_DISABLED)
-/*
+/**
* inraw option description:
*/
-#define INRAW_DESC (certtool_opt_strs+3863)
+/** Descriptive text for the inraw option */
+#define INRAW_DESC (certtool_opt_strs+3862)
#define INRAW_NAME NULL
-#define INRAW_name (certtool_opt_strs+3892)
+/** Unmodified name string for the inraw option */
+#define INRAW_name (certtool_opt_strs+3894)
+/** Compiled in flag settings for the inraw option */
#define INRAW_FLAGS (INDER_FLAGS | OPTST_ALIAS)
-/*
+/**
* outder option description:
*/
-#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)
+/** 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_name (NOT_OUTDER_name + 3)
+/** Compiled in flag settings for the outder option */
#define OUTDER_FLAGS (OPTST_DISABLED)
-/*
+/**
* outraw option description:
*/
-#define OUTRAW_DESC (certtool_opt_strs+3971)
+/** Descriptive text for the outraw option */
+#define OUTRAW_DESC (certtool_opt_strs+3973)
#define OUTRAW_NAME NULL
-#define OUTRAW_name (certtool_opt_strs+4001)
+/** Unmodified name string for the outraw option */
+#define OUTRAW_name (certtool_opt_strs+4006)
+/** Compiled in flag settings for the outraw option */
#define OUTRAW_FLAGS (OUTDER_FLAGS | OPTST_ALIAS)
-/*
+/**
* bits option description:
*/
-#define BITS_DESC (certtool_opt_strs+4008)
-#define BITS_NAME (certtool_opt_strs+4052)
-#define BITS_name (certtool_opt_strs+4057)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* sec-param option description:
*/
-#define SEC_PARAM_DESC (certtool_opt_strs+4062)
-#define SEC_PARAM_NAME (certtool_opt_strs+4125)
-#define SEC_PARAM_name (certtool_opt_strs+4135)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* disable-quick-random option description:
*/
-#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)
+/** 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_FLAGS (OPTST_DISABLED)
-/*
+/**
* template option description:
*/
-#define TEMPLATE_DESC (certtool_opt_strs+4197)
-#define TEMPLATE_NAME (certtool_opt_strs+4248)
-#define TEMPLATE_name (certtool_opt_strs+4257)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* pkcs-cipher option description:
*/
-#define PKCS_CIPHER_DESC (certtool_opt_strs+4266)
-#define PKCS_CIPHER_NAME (certtool_opt_strs+4311)
-#define PKCS_CIPHER_name (certtool_opt_strs+4323)
+/** 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_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
/*
* Help/More_Help/Version option descriptions:
*/
-#define HELP_DESC (certtool_opt_strs+4335)
-#define HELP_name (certtool_opt_strs+4379)
+#define HELP_DESC (certtool_opt_strs+4340)
+#define HELP_name (certtool_opt_strs+4384)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (certtool_opt_strs+4384)
-#define MORE_HELP_name (certtool_opt_strs+4429)
+#define MORE_HELP_DESC (certtool_opt_strs+4389)
+#define MORE_HELP_name (certtool_opt_strs+4434)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC NULL
@@ -790,9 +1021,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+4439)
-#define VER_name (certtool_opt_strs+4475)
-/*
+#define VER_DESC (certtool_opt_strs+4444)
+#define VER_name (certtool_opt_strs+4480)
+/**
* Declare option callback procedures
*/
extern tOptProc
@@ -1513,7 +1744,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, 0,
+ /* opt state flags */ VER_FLAGS, AOUSE_VERSION,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -1527,7 +1758,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, 0,
+ /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -1539,7 +1770,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, 0,
+ /* opt state flags */ MORE_HELP_FLAGS, AOUSE_MORE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -1549,19 +1780,24 @@ static tOptDesc optDesc[OPTION_CT] = {
};
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Define the certtool Option Environment
- */
-#define zPROGNAME (certtool_opt_strs+4483)
-#define zUsageTitle (certtool_opt_strs+4492)
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/** 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 zRcName NULL
+/** There are no directories to search for certtool config files. */
#define apzHomeList NULL
-#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 350 */
+/** 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 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT
@@ -1571,10 +1807,8 @@ 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+4817)
+#define certtool_short_usage (certtool_opt_strs+4803)
#endif /* not defined __doxygen__ */
@@ -1584,8 +1818,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/**
* The callout function that invokes the optionUsage function.
*
- * @param pOptions the AutoOpts option description structure
- * @param pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] pOptions the AutoOpts option description structure
+ * @param[in] pOptDesc the descriptor for the "help" (usage) option.
* @noreturn
*/
static void
@@ -1600,9 +1834,9 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Code to handle the debug option.
- *
- * @param pOptions the certtool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * Specifies the debug level.
+ * @param[in] pOptions the certtool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1628,8 +1862,7 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
@@ -1637,8 +1870,8 @@ emit_ranges:
/**
* Code to handle the infile option.
*
- * @param pOptions the certtool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the certtool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptInfile(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1651,6 +1884,9 @@ doOptInfile(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1658,8 +1894,8 @@ doOptInfile(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the load-request option.
*
- * @param pOptions the certtool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the certtool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptLoad_Request(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1672,6 +1908,9 @@ doOptLoad_Request(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1679,15 +1918,15 @@ doOptLoad_Request(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the ecdsa option.
*
- * @param pOptions the certtool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the certtool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptEcdsa(tOptions* pOptions, tOptDesc* pOptDesc)
{
int res = optionAlias(pOptions, pOptDesc, INDEX_OPT_ECC);
if ((res != 0) && ((pOptions->fOptSet & OPTPROC_ERRSTOP) != 0))
- USAGE(CERTTOOL_EXIT_FAILURE);
+ USAGE(CERTTOOL_EXIT_USAGE_ERROR);
}
@@ -1695,15 +1934,15 @@ doOptEcdsa(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the inraw option.
*
- * @param pOptions the certtool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the certtool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptInraw(tOptions* pOptions, tOptDesc* pOptDesc)
{
int res = optionAlias(pOptions, pOptDesc, INDEX_OPT_INDER);
if ((res != 0) && ((pOptions->fOptSet & OPTPROC_ERRSTOP) != 0))
- USAGE(CERTTOOL_EXIT_FAILURE);
+ USAGE(CERTTOOL_EXIT_USAGE_ERROR);
}
@@ -1711,15 +1950,15 @@ doOptInraw(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the outraw option.
*
- * @param pOptions the certtool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the certtool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptOutraw(tOptions* pOptions, tOptDesc* pOptDesc)
{
int res = optionAlias(pOptions, pOptDesc, INDEX_OPT_OUTDER);
if ((res != 0) && ((pOptions->fOptSet & OPTPROC_ERRSTOP) != 0))
- USAGE(CERTTOOL_EXIT_FAILURE);
+ USAGE(CERTTOOL_EXIT_USAGE_ERROR);
}
@@ -1727,8 +1966,8 @@ doOptOutraw(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the template option.
*
- * @param pOptions the certtool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the certtool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptTemplate(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1741,9 +1980,12 @@ doOptTemplate(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
-/* extracted from optmain.tlib near line 1113 */
+/* extracted from optmain.tlib near line 1254 */
/**
* The directory containing the data associated with certtool.
@@ -1759,6 +2001,7 @@ 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
@@ -1814,42 +2057,69 @@ 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>
#include <unistd.h>
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
#include <autoopts/usage-txt.h>
-static char* AO_gettext(char const* pz);
-static void coerce_it(void** s);
+static char * AO_gettext(char const * pz);
+static void coerce_it(void ** s);
/**
- * AutoGen specific wrapper function for gettext.
- * It relies on the macro _() to convert from English to the target
- * language, then strdup-duplicates the result string.
+ * AutoGen specific wrapper function for gettext. It relies on the macro _()
+ * to convert from English to the target language, then strdup-duplicates the
+ * result string. It tries the "libopts" domain first, then whatever has been
+ * set via the \a textdomain(3) call.
*
* @param[in] pz the input text used as a lookup key.
* @returns the translated text (if there is one),
* or the original text (if not).
*/
static char *
-AO_gettext(char const* pz)
+AO_gettext(char const * pz)
{
- char* pzRes;
+ char * res;
if (pz == NULL)
return NULL;
- pzRes = _(pz);
- if (pzRes == pz)
- return pzRes;
- pzRes = strdup(pzRes);
- if (pzRes == NULL) {
+#ifdef HAVE_DCGETTEXT
+ /*
+ * While processing the option_xlateable_txt data, try to use the
+ * "libopts" domain. Once we switch to the option descriptor data,
+ * do *not* use that domain.
+ */
+ if (option_xlateable_txt.field_ct != 0) {
+ res = dgettext("libopts", pz);
+ if (res == pz)
+ res = (char *)(void *)_(pz);
+ } else
+ res = (char *)(void *)_(pz);
+#else
+ res = (char *)(void *)_(pz);
+#endif
+ if (res == pz)
+ return res;
+ res = strdup(res);
+ if (res == NULL) {
fputs(_("No memory for duping translated strings\n"), stderr);
exit(CERTTOOL_EXIT_FAILURE);
}
- return pzRes;
+ return res;
}
-static void coerce_it(void** s) { *s = AO_gettext(*s);
+/**
+ * All the pointers we use are marked "* const", but they are stored in
+ * writable memory. Coerce the mutability and set the pointer.
+ */
+static void coerce_it(void ** s) { *s = AO_gettext(*s);
}
/**
@@ -1859,56 +2129,577 @@ static void coerce_it(void** s) { *s = AO_gettext(*s);
static void
translate_option_strings(void)
{
- tOptions * const pOpt = &certtoolOptions;
+ tOptions * const opts = &certtoolOptions;
/*
* Guard against re-translation. It won't work. The strings will have
* been changed by the first pass through this code. One shot only.
*/
- if (option_usage_text.field_ct != 0) {
+ if (option_xlateable_txt.field_ct != 0) {
/*
* Do the translations. The first pointer follows the field count
* field. The field count field is the size of a pointer.
*/
- tOptDesc * pOD = pOpt->pOptDesc;
- char ** ppz = (char**)(void*)&(option_usage_text);
- int ix = option_usage_text.field_ct;
+ char ** ppz = (char**)(void*)&(option_xlateable_txt);
+ int ix = option_xlateable_txt.field_ct;
do {
- ppz++;
+ ppz++; /* skip over field_ct */
*ppz = AO_gettext(*ppz);
} while (--ix > 0);
-
- coerce_it((void*)&(pOpt->pzCopyright));
- coerce_it((void*)&(pOpt->pzCopyNotice));
- coerce_it((void*)&(pOpt->pzFullVersion));
- coerce_it((void*)&(pOpt->pzUsageTitle));
- coerce_it((void*)&(pOpt->pzExplain));
- coerce_it((void*)&(pOpt->pzDetail));
- coerce_it((void*)&(pOpt->pzPackager));
- coerce_it((void*)&(pOpt->pzShortUsage));
- option_usage_text.field_ct = 0;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++)
- coerce_it((void*)&(pOD->pzText));
- }
-
- if ((pOpt->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
- tOptDesc * pOD = pOpt->pOptDesc;
- int ix;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++) {
- coerce_it((void*)&(pOD->pz_Name));
- coerce_it((void*)&(pOD->pz_DisableName));
- coerce_it((void*)&(pOD->pz_DisablePfx));
+ /* prevent re-translation and disable "libopts" domain lookup */
+ option_xlateable_txt.field_ct = 0;
+
+ coerce_it((void*)&(opts->pzCopyright));
+ coerce_it((void*)&(opts->pzCopyNotice));
+ coerce_it((void*)&(opts->pzFullVersion));
+ 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));
}
- /* prevent re-translation */
- certtoolOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
}
-
#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"));
+
+ /* 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"));
+
+ /* referenced via certtoolOptions.pOptDesc->pzText */
+ puts(_("an alias for the 'ecc' option"));
+
+ /* referenced via certtoolOptions.pOptDesc->pzText */
+ puts(_("Hash algorithm to use for signing."));
+
+ /* referenced via certtoolOptions.pOptDesc->pzText */
+ puts(_("Use DER format for input certificates and private keys."));
+
+ /* 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.h b/src/certtool-args.h
index fa639ee17c..00c3192a39 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 March 7, 2013 at 02:51:42 AM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:18 PM by AutoGen 5.17.3
* From the definitions certtool-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This header file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,24 +21,23 @@
*
* 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
@@ -49,22 +48,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 147460
+#define AO_TEMPLATE_VERSION 155648
#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:
+/**
+ * Enumeration of each option type for certtool
*/
typedef enum {
INDEX_OPT_DEBUG = 0,
@@ -129,44 +128,63 @@ 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 {
- CERTTOOL_EXIT_SUCCESS = 0,
- CERTTOOL_EXIT_FAILURE = 1,
- CERTTOOL_EXIT_LIBOPTS_FAILURE = 70
+ CERTTOOL_EXIT_SUCCESS = 0,
+ CERTTOOL_EXIT_FAILURE = 1,
+ CERTTOOL_EXIT_USAGE_ERROR = 64,
+ CERTTOOL_EXIT_LIBOPTS_FAILURE = 70
} certtool_exit_code_t;
-/* * * * * *
- *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/**
* Interface defines for specific options.
+ * @{
*/
#define VALUE_OPT_DEBUG 'd'
@@ -230,8 +248,11 @@ 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
@@ -243,7 +264,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 484 */
+/* extracted from opthead.tlib near line 538 */
#ifdef __cplusplus
extern "C" {
@@ -263,6 +284,12 @@ extern tOptions certtoolOptions;
#if defined(ENABLE_NLS)
# ifndef _
# include <stdio.h>
+# ifndef HAVE_GETTEXT
+ extern char * gettext(char const *);
+# else
+# include <libintl.h>
+# endif
+
static inline char* aoGetsText(char const* pz) {
if (pz == NULL) return NULL;
return (char*)gettext(pz);
diff --git a/src/cli-args.c b/src/cli-args.c
index 083a308763..6eb09bf55b 100644
--- a/src/cli-args.c
+++ b/src/cli-args.c
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (cli-args.c)
- *
- * It has been AutoGen-ed February 1, 2013 at 08:10:51 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:17 PM by AutoGen 5.17.3
* From the definitions cli-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This source file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,20 +21,19 @@
*
* 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>
*
* gnutls-cli 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.
- *
+ *
* gnutls-cli 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/>.
*/
@@ -53,28 +52,24 @@
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 (gnutls_cli_opt_strs+0)
-#define zLicenseDescrip (gnutls_cli_opt_strs+281)
+#define zLicenseDescrip (gnutls_cli_opt_strs+277)
#ifndef NULL
# define NULL 0
#endif
-/*
- * gnutls-cli option static const strings
+/**
+ * static const strings for gnutls-cli options
*/
-static char const gnutls_cli_opt_strs[3921] =
+static char const gnutls_cli_opt_strs[3898] =
/* 0 */ "gnutls-cli @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\n"
- "GNU General Public License, version 3 or later\n"
- " <http://gnu.org/licenses/gpl.html>\n\0"
-/* 281 */ "gnutls-cli is free software: you can redistribute it and/or modify it under\n"
+ "redistribution under the terms of the GNU General Public License,\n"
+ "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0"
+/* 277 */ "gnutls-cli 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"
@@ -84,547 +79,732 @@ static char const gnutls_cli_opt_strs[3921] =
"more 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"
-/* 890 */ "Enable debugging.\0"
-/* 908 */ "DEBUG\0"
-/* 914 */ "debug\0"
-/* 920 */ "More verbose output\0"
-/* 940 */ "VERBOSE\0"
-/* 948 */ "verbose\0"
-/* 956 */ "Enable trust on first use authentication\0"
-/* 997 */ "TOFU\0"
-/* 1002 */ "no-tofu\0"
-/* 1010 */ "no\0"
-/* 1013 */ "Enable DANE certificate verification (DNSSEC)\0"
-/* 1059 */ "DANE\0"
-/* 1064 */ "no-dane\0"
-/* 1072 */ "Use the local DNS server for DNSSEC resolving.\0"
-/* 1119 */ "LOCAL_DNS\0"
-/* 1129 */ "no-local-dns\0"
-/* 1142 */ "Disable CA certificate verification\0"
-/* 1178 */ "CA_VERIFICATION\0"
-/* 1194 */ "no-ca-verification\0"
-/* 1213 */ "Enable OCSP certificate verification\0"
-/* 1250 */ "OCSP\0"
-/* 1255 */ "no-ocsp\0"
-/* 1263 */ "Establish a session and resume\0"
-/* 1294 */ "RESUME\0"
-/* 1301 */ "resume\0"
-/* 1308 */ "Activate heartbeat support\0"
-/* 1335 */ "HEARTBEAT\0"
-/* 1345 */ "heartbeat\0"
-/* 1355 */ "Establish a session and rehandshake\0"
-/* 1391 */ "REHANDSHAKE\0"
-/* 1403 */ "rehandshake\0"
-/* 1415 */ "Don't accept session tickets\0"
-/* 1444 */ "NOTICKET\0"
-/* 1453 */ "noticket\0"
-/* 1462 */ "Connect, establish a plain session and start TLS.\0"
-/* 1512 */ "STARTTLS\0"
-/* 1521 */ "starttls\0"
-/* 1530 */ "Use DTLS (datagram TLS) over UDP\0"
-/* 1563 */ "UDP\0"
-/* 1567 */ "udp\0"
-/* 1571 */ "Set MTU for datagram TLS\0"
-/* 1596 */ "MTU\0"
-/* 1600 */ "mtu\0"
-/* 1604 */ "Offer SRTP profiles\0"
-/* 1624 */ "SRTP_PROFILES\0"
-/* 1638 */ "srtp-profiles\0"
-/* 1652 */ "Send CR LF instead of LF\0"
-/* 1677 */ "CRLF\0"
-/* 1682 */ "crlf\0"
-/* 1687 */ "Use DER format for certificates to read from\0"
-/* 1732 */ "X509FMTDER\0"
-/* 1743 */ "x509fmtder\0"
-/* 1754 */ "Send the openpgp fingerprint, instead of the key\0"
-/* 1803 */ "FINGERPRINT\0"
-/* 1815 */ "fingerprint\0"
-/* 1827 */ "Disable all the TLS extensions\0"
-/* 1858 */ "DISABLE_EXTENSIONS\0"
-/* 1877 */ "disable-extensions\0"
-/* 1896 */ "Print peer's certificate in PEM format\0"
-/* 1935 */ "PRINT_CERT\0"
-/* 1946 */ "print-cert\0"
-/* 1957 */ "The maximum record size to advertize\0"
-/* 1994 */ "RECORDSIZE\0"
-/* 2005 */ "recordsize\0"
-/* 2016 */ "The minimum number of bits allowed for DH\0"
-/* 2058 */ "DH_BITS\0"
-/* 2066 */ "dh-bits\0"
-/* 2074 */ "Priorities string\0"
-/* 2092 */ "PRIORITY\0"
-/* 2101 */ "priority\0"
-/* 2110 */ "Certificate file or PKCS #11 URL to use\0"
-/* 2150 */ "X509CAFILE\0"
-/* 2161 */ "x509cafile\0"
-/* 2172 */ "CRL file to use\0"
-/* 2188 */ "X509CRLFILE\0"
-/* 2200 */ "x509crlfile\0"
-/* 2212 */ "PGP Key file to use\0"
-/* 2232 */ "PGPKEYFILE\0"
-/* 2243 */ "pgpkeyfile\0"
-/* 2254 */ "PGP Key ring file to use\0"
-/* 2279 */ "PGPKEYRING\0"
-/* 2290 */ "pgpkeyring\0"
-/* 2301 */ "PGP Public Key (certificate) file to use\0"
-/* 2342 */ "PGPCERTFILE\0"
-/* 2354 */ "pgpcertfile\0"
-/* 2366 */ "X.509 key file or PKCS #11 URL to use\0"
-/* 2404 */ "X509KEYFILE\0"
-/* 2416 */ "x509keyfile\0"
-/* 2428 */ "X.509 Certificate file or PKCS #11 URL to use\0"
-/* 2474 */ "X509CERTFILE\0"
-/* 2487 */ "x509certfile\0"
-/* 2500 */ "PGP subkey to use (hex or auto)\0"
-/* 2532 */ "PGPSUBKEY\0"
-/* 2542 */ "pgpsubkey\0"
-/* 2552 */ "SRP username to use\0"
-/* 2572 */ "SRPUSERNAME\0"
-/* 2584 */ "srpusername\0"
-/* 2596 */ "SRP password to use\0"
-/* 2616 */ "SRPPASSWD\0"
-/* 2626 */ "srppasswd\0"
-/* 2636 */ "PSK username to use\0"
-/* 2656 */ "PSKUSERNAME\0"
-/* 2668 */ "pskusername\0"
-/* 2680 */ "PSK key (in hex) to use\0"
-/* 2704 */ "PSKKEY\0"
-/* 2711 */ "pskkey\0"
-/* 2718 */ "The port or service to connect to\0"
-/* 2752 */ "PORT\0"
-/* 2757 */ "port\0"
-/* 2762 */ "Don't abort program if server certificate can't be validated\0"
-/* 2823 */ "INSECURE\0"
-/* 2832 */ "insecure\0"
-/* 2841 */ "Use length-hiding padding to prevent traffic analysis\0"
-/* 2895 */ "RANGES\0"
-/* 2902 */ "ranges\0"
-/* 2909 */ "Benchmark individual ciphers\0"
-/* 2938 */ "BENCHMARK_CIPHERS\0"
-/* 2956 */ "benchmark-ciphers\0"
-/* 2974 */ "Benchmark individual software ciphers (no hw acceleration)\0"
-/* 3033 */ "BENCHMARK_SOFT_CIPHERS\0"
-/* 3056 */ "benchmark-soft-ciphers\0"
-/* 3079 */ "Benchmark TLS key exchange methods\0"
-/* 3114 */ "BENCHMARK_TLS_KX\0"
-/* 3131 */ "benchmark-tls-kx\0"
-/* 3148 */ "Benchmark TLS ciphers\0"
-/* 3170 */ "BENCHMARK_TLS_CIPHERS\0"
-/* 3192 */ "benchmark-tls-ciphers\0"
-/* 3214 */ "Print a list of the supported algorithms and modes\0"
-/* 3265 */ "LIST\0"
-/* 3270 */ "list\0"
-/* 3275 */ "Do not send a Server Name Indication (SNI)\0"
-/* 3318 */ "DISABLE_SNI\0"
-/* 3330 */ "disable-sni\0"
-/* 3342 */ "Display extended usage information and exit\0"
-/* 3386 */ "help\0"
-/* 3391 */ "Extended usage information passed thru pager\0"
-/* 3436 */ "more-help\0"
-/* 3446 */ "Output version information and exit\0"
-/* 3482 */ "version\0"
-/* 3490 */ "GNUTLS_CLI\0"
-/* 3501 */ "gnutls-cli - GnuTLS client - Ver. @VERSION@\n"
- "USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostname]\n\0"
-/* 3614 */ "bug-gnutls@gnu.org\0"
-/* 3633 */ "\n\n\0"
-/* 3636 */ "\n"
- "Simple client program to set up a TLS connection to some other computer. It\n"
+/* 886 */ "Enable debugging.\0"
+/* 904 */ "DEBUG\0"
+/* 910 */ "debug\0"
+/* 916 */ "More verbose output\0"
+/* 936 */ "VERBOSE\0"
+/* 944 */ "verbose\0"
+/* 952 */ "Enable trust on first use authentication\0"
+/* 993 */ "TOFU\0"
+/* 998 */ "no-tofu\0"
+/* 1006 */ "no\0"
+/* 1009 */ "Enable DANE certificate verification (DNSSEC)\0"
+/* 1055 */ "DANE\0"
+/* 1060 */ "no-dane\0"
+/* 1068 */ "Use the local DNS server for DNSSEC resolving.\0"
+/* 1115 */ "LOCAL_DNS\0"
+/* 1125 */ "no-local-dns\0"
+/* 1138 */ "Disable CA certificate verification\0"
+/* 1174 */ "CA_VERIFICATION\0"
+/* 1190 */ "no-ca-verification\0"
+/* 1209 */ "Enable OCSP certificate verification\0"
+/* 1246 */ "OCSP\0"
+/* 1251 */ "no-ocsp\0"
+/* 1259 */ "Establish a session and resume\0"
+/* 1290 */ "RESUME\0"
+/* 1297 */ "resume\0"
+/* 1304 */ "Activate heartbeat support\0"
+/* 1331 */ "HEARTBEAT\0"
+/* 1341 */ "heartbeat\0"
+/* 1351 */ "Establish a session and rehandshake\0"
+/* 1387 */ "REHANDSHAKE\0"
+/* 1399 */ "rehandshake\0"
+/* 1411 */ "Don't accept session tickets\0"
+/* 1440 */ "NOTICKET\0"
+/* 1449 */ "noticket\0"
+/* 1458 */ "Connect, establish a plain session and start TLS.\0"
+/* 1508 */ "STARTTLS\0"
+/* 1517 */ "starttls\0"
+/* 1526 */ "Use DTLS (datagram TLS) over UDP\0"
+/* 1559 */ "UDP\0"
+/* 1563 */ "udp\0"
+/* 1567 */ "Set MTU for datagram TLS\0"
+/* 1592 */ "MTU\0"
+/* 1596 */ "mtu\0"
+/* 1600 */ "Offer SRTP profiles\0"
+/* 1620 */ "SRTP_PROFILES\0"
+/* 1634 */ "srtp-profiles\0"
+/* 1648 */ "Send CR LF instead of LF\0"
+/* 1673 */ "CRLF\0"
+/* 1678 */ "crlf\0"
+/* 1683 */ "Use DER format for certificates to read from\0"
+/* 1728 */ "X509FMTDER\0"
+/* 1739 */ "x509fmtder\0"
+/* 1750 */ "Send the openpgp fingerprint, instead of the key\0"
+/* 1799 */ "FINGERPRINT\0"
+/* 1811 */ "fingerprint\0"
+/* 1823 */ "Disable all the TLS extensions\0"
+/* 1854 */ "DISABLE_EXTENSIONS\0"
+/* 1873 */ "disable-extensions\0"
+/* 1892 */ "Print peer's certificate in PEM format\0"
+/* 1931 */ "PRINT_CERT\0"
+/* 1942 */ "print-cert\0"
+/* 1953 */ "The maximum record size to advertize\0"
+/* 1990 */ "RECORDSIZE\0"
+/* 2001 */ "recordsize\0"
+/* 2012 */ "The minimum number of bits allowed for DH\0"
+/* 2054 */ "DH_BITS\0"
+/* 2062 */ "dh-bits\0"
+/* 2070 */ "Priorities string\0"
+/* 2088 */ "PRIORITY\0"
+/* 2097 */ "priority\0"
+/* 2106 */ "Certificate file or PKCS #11 URL to use\0"
+/* 2146 */ "X509CAFILE\0"
+/* 2157 */ "x509cafile\0"
+/* 2168 */ "CRL file to use\0"
+/* 2184 */ "X509CRLFILE\0"
+/* 2196 */ "x509crlfile\0"
+/* 2208 */ "PGP Key file to use\0"
+/* 2228 */ "PGPKEYFILE\0"
+/* 2239 */ "pgpkeyfile\0"
+/* 2250 */ "PGP Key ring file to use\0"
+/* 2275 */ "PGPKEYRING\0"
+/* 2286 */ "pgpkeyring\0"
+/* 2297 */ "PGP Public Key (certificate) file to use\0"
+/* 2338 */ "PGPCERTFILE\0"
+/* 2350 */ "pgpcertfile\0"
+/* 2362 */ "X.509 key file or PKCS #11 URL to use\0"
+/* 2400 */ "X509KEYFILE\0"
+/* 2412 */ "x509keyfile\0"
+/* 2424 */ "X.509 Certificate file or PKCS #11 URL to use\0"
+/* 2470 */ "X509CERTFILE\0"
+/* 2483 */ "x509certfile\0"
+/* 2496 */ "PGP subkey to use (hex or auto)\0"
+/* 2528 */ "PGPSUBKEY\0"
+/* 2538 */ "pgpsubkey\0"
+/* 2548 */ "SRP username to use\0"
+/* 2568 */ "SRPUSERNAME\0"
+/* 2580 */ "srpusername\0"
+/* 2592 */ "SRP password to use\0"
+/* 2612 */ "SRPPASSWD\0"
+/* 2622 */ "srppasswd\0"
+/* 2632 */ "PSK username to use\0"
+/* 2652 */ "PSKUSERNAME\0"
+/* 2664 */ "pskusername\0"
+/* 2676 */ "PSK key (in hex) to use\0"
+/* 2700 */ "PSKKEY\0"
+/* 2707 */ "pskkey\0"
+/* 2714 */ "The port or service to connect to\0"
+/* 2748 */ "PORT\0"
+/* 2753 */ "port\0"
+/* 2758 */ "Don't abort program if server certificate can't be validated\0"
+/* 2819 */ "INSECURE\0"
+/* 2828 */ "insecure\0"
+/* 2837 */ "Use length-hiding padding to prevent traffic analysis\0"
+/* 2891 */ "RANGES\0"
+/* 2898 */ "ranges\0"
+/* 2905 */ "Benchmark individual ciphers\0"
+/* 2934 */ "BENCHMARK_CIPHERS\0"
+/* 2952 */ "benchmark-ciphers\0"
+/* 2970 */ "Benchmark individual software ciphers (no hw acceleration)\0"
+/* 3029 */ "BENCHMARK_SOFT_CIPHERS\0"
+/* 3052 */ "benchmark-soft-ciphers\0"
+/* 3075 */ "Benchmark TLS key exchange methods\0"
+/* 3110 */ "BENCHMARK_TLS_KX\0"
+/* 3127 */ "benchmark-tls-kx\0"
+/* 3144 */ "Benchmark TLS ciphers\0"
+/* 3166 */ "BENCHMARK_TLS_CIPHERS\0"
+/* 3188 */ "benchmark-tls-ciphers\0"
+/* 3210 */ "Print a list of the supported algorithms and modes\0"
+/* 3261 */ "LIST\0"
+/* 3266 */ "list\0"
+/* 3271 */ "Do not send a Server Name Indication (SNI)\0"
+/* 3314 */ "DISABLE_SNI\0"
+/* 3326 */ "disable-sni\0"
+/* 3338 */ "display extended usage information and exit\0"
+/* 3382 */ "help\0"
+/* 3387 */ "extended usage information passed thru pager\0"
+/* 3432 */ "more-help\0"
+/* 3442 */ "output version information and exit\0"
+/* 3478 */ "version\0"
+/* 3486 */ "GNUTLS_CLI\0"
+/* 3497 */ "gnutls-cli - GnuTLS client\n"
+ "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostname]\n\0"
+/* 3593 */ "bug-gnutls@gnu.org\0"
+/* 3612 */ "\n\0"
+/* 3614 */ "Simple client program to set up a TLS connection to some other computer. It\n"
"sets up a TLS connection and forwards data from the standard input to the\n"
"secured socket and vice versa.\n\0"
-/* 3820 */ "gnutls-cli @VERSION@\0"
-/* 3841 */ "Usage: gnutls-cli [options] hostname\n"
+/* 3797 */ "gnutls-cli @VERSION@\0"
+/* 3818 */ "Usage: gnutls-cli [options] hostname\n"
"gnutls-cli --help for usage instructions.\n";
-/*
+/**
* debug option description:
*/
-#define DEBUG_DESC (gnutls_cli_opt_strs+890)
-#define DEBUG_NAME (gnutls_cli_opt_strs+908)
-#define DEBUG_name (gnutls_cli_opt_strs+914)
+/** Descriptive text for the debug option */
+#define DEBUG_DESC (gnutls_cli_opt_strs+886)
+/** Upper-cased name for the debug option */
+#define DEBUG_NAME (gnutls_cli_opt_strs+904)
+/** Name string for the debug option */
+#define DEBUG_name (gnutls_cli_opt_strs+910)
+/** Compiled in flag settings for the debug option */
#define DEBUG_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* verbose option description:
*/
-#define VERBOSE_DESC (gnutls_cli_opt_strs+920)
-#define VERBOSE_NAME (gnutls_cli_opt_strs+940)
-#define VERBOSE_name (gnutls_cli_opt_strs+948)
+/** Descriptive text for the verbose option */
+#define VERBOSE_DESC (gnutls_cli_opt_strs+916)
+/** Upper-cased name for the verbose option */
+#define VERBOSE_NAME (gnutls_cli_opt_strs+936)
+/** Name string for the verbose option */
+#define VERBOSE_name (gnutls_cli_opt_strs+944)
+/** Compiled in flag settings for the verbose option */
#define VERBOSE_FLAGS (OPTST_DISABLED)
-/*
+/**
* tofu option description:
*/
-#define TOFU_DESC (gnutls_cli_opt_strs+956)
-#define TOFU_NAME (gnutls_cli_opt_strs+997)
-#define NOT_TOFU_name (gnutls_cli_opt_strs+1002)
-#define NOT_TOFU_PFX (gnutls_cli_opt_strs+1010)
+/** Descriptive text for the tofu option */
+#define TOFU_DESC (gnutls_cli_opt_strs+952)
+/** Upper-cased name for the tofu option */
+#define TOFU_NAME (gnutls_cli_opt_strs+993)
+/** disablement name for the tofu option */
+#define NOT_TOFU_name (gnutls_cli_opt_strs+998)
+/** disablement prefix for the tofu option */
+#define NOT_TOFU_PFX (gnutls_cli_opt_strs+1006)
+/** Name string for the tofu option */
#define TOFU_name (NOT_TOFU_name + 3)
+/** Compiled in flag settings for the tofu option */
#define TOFU_FLAGS (OPTST_DISABLED)
-/*
+/**
* dane option description:
*/
-#define DANE_DESC (gnutls_cli_opt_strs+1013)
-#define DANE_NAME (gnutls_cli_opt_strs+1059)
-#define NOT_DANE_name (gnutls_cli_opt_strs+1064)
-#define NOT_DANE_PFX (gnutls_cli_opt_strs+1010)
+/** Descriptive text for the dane option */
+#define DANE_DESC (gnutls_cli_opt_strs+1009)
+/** Upper-cased name for the dane option */
+#define DANE_NAME (gnutls_cli_opt_strs+1055)
+/** disablement name for the dane option */
+#define NOT_DANE_name (gnutls_cli_opt_strs+1060)
+/** disablement prefix for the dane option */
+#define NOT_DANE_PFX (gnutls_cli_opt_strs+1006)
+/** Name string for the dane option */
#define DANE_name (NOT_DANE_name + 3)
+/** Compiled in flag settings for the dane option */
#define DANE_FLAGS (OPTST_DISABLED)
-/*
+/**
* local-dns option description:
*/
-#define LOCAL_DNS_DESC (gnutls_cli_opt_strs+1072)
-#define LOCAL_DNS_NAME (gnutls_cli_opt_strs+1119)
-#define NOT_LOCAL_DNS_name (gnutls_cli_opt_strs+1129)
-#define NOT_LOCAL_DNS_PFX (gnutls_cli_opt_strs+1010)
+/** Descriptive text for the local-dns option */
+#define LOCAL_DNS_DESC (gnutls_cli_opt_strs+1068)
+/** Upper-cased name for the local-dns option */
+#define LOCAL_DNS_NAME (gnutls_cli_opt_strs+1115)
+/** disablement name for the local-dns option */
+#define NOT_LOCAL_DNS_name (gnutls_cli_opt_strs+1125)
+/** disablement prefix for the local-dns option */
+#define NOT_LOCAL_DNS_PFX (gnutls_cli_opt_strs+1006)
+/** Name string for the local-dns option */
#define LOCAL_DNS_name (NOT_LOCAL_DNS_name + 3)
+/** Compiled in flag settings for the local-dns option */
#define LOCAL_DNS_FLAGS (OPTST_DISABLED)
-/*
+/**
* ca-verification option description:
*/
-#define CA_VERIFICATION_DESC (gnutls_cli_opt_strs+1142)
-#define CA_VERIFICATION_NAME (gnutls_cli_opt_strs+1178)
-#define NOT_CA_VERIFICATION_name (gnutls_cli_opt_strs+1194)
-#define NOT_CA_VERIFICATION_PFX (gnutls_cli_opt_strs+1010)
+/** Descriptive text for the ca-verification option */
+#define CA_VERIFICATION_DESC (gnutls_cli_opt_strs+1138)
+/** Upper-cased name for the ca-verification option */
+#define CA_VERIFICATION_NAME (gnutls_cli_opt_strs+1174)
+/** disablement name for the ca-verification option */
+#define NOT_CA_VERIFICATION_name (gnutls_cli_opt_strs+1190)
+/** disablement prefix for the ca-verification option */
+#define NOT_CA_VERIFICATION_PFX (gnutls_cli_opt_strs+1006)
+/** Name string for the ca-verification option */
#define CA_VERIFICATION_name (NOT_CA_VERIFICATION_name + 3)
+/** Compiled in flag settings for the ca-verification option */
#define CA_VERIFICATION_FLAGS (OPTST_INITENABLED)
-/*
+/**
* ocsp option description:
*/
-#define OCSP_DESC (gnutls_cli_opt_strs+1213)
-#define OCSP_NAME (gnutls_cli_opt_strs+1250)
-#define NOT_OCSP_name (gnutls_cli_opt_strs+1255)
-#define NOT_OCSP_PFX (gnutls_cli_opt_strs+1010)
+/** Descriptive text for the ocsp option */
+#define OCSP_DESC (gnutls_cli_opt_strs+1209)
+/** Upper-cased name for the ocsp option */
+#define OCSP_NAME (gnutls_cli_opt_strs+1246)
+/** disablement name for the ocsp option */
+#define NOT_OCSP_name (gnutls_cli_opt_strs+1251)
+/** disablement prefix for the ocsp option */
+#define NOT_OCSP_PFX (gnutls_cli_opt_strs+1006)
+/** Name string for the ocsp option */
#define OCSP_name (NOT_OCSP_name + 3)
+/** Compiled in flag settings for the ocsp option */
#define OCSP_FLAGS (OPTST_DISABLED)
-/*
+/**
* resume option description:
*/
-#define RESUME_DESC (gnutls_cli_opt_strs+1263)
-#define RESUME_NAME (gnutls_cli_opt_strs+1294)
-#define RESUME_name (gnutls_cli_opt_strs+1301)
+/** Descriptive text for the resume option */
+#define RESUME_DESC (gnutls_cli_opt_strs+1259)
+/** Upper-cased name for the resume option */
+#define RESUME_NAME (gnutls_cli_opt_strs+1290)
+/** Name string for the resume option */
+#define RESUME_name (gnutls_cli_opt_strs+1297)
+/** Compiled in flag settings for the resume option */
#define RESUME_FLAGS (OPTST_DISABLED)
-/*
+/**
* heartbeat option description:
*/
-#define HEARTBEAT_DESC (gnutls_cli_opt_strs+1308)
-#define HEARTBEAT_NAME (gnutls_cli_opt_strs+1335)
-#define HEARTBEAT_name (gnutls_cli_opt_strs+1345)
+/** Descriptive text for the heartbeat option */
+#define HEARTBEAT_DESC (gnutls_cli_opt_strs+1304)
+/** Upper-cased name for the heartbeat option */
+#define HEARTBEAT_NAME (gnutls_cli_opt_strs+1331)
+/** Name string for the heartbeat option */
+#define HEARTBEAT_name (gnutls_cli_opt_strs+1341)
+/** Compiled in flag settings for the heartbeat option */
#define HEARTBEAT_FLAGS (OPTST_DISABLED)
-/*
+/**
* rehandshake option description:
*/
-#define REHANDSHAKE_DESC (gnutls_cli_opt_strs+1355)
-#define REHANDSHAKE_NAME (gnutls_cli_opt_strs+1391)
-#define REHANDSHAKE_name (gnutls_cli_opt_strs+1403)
+/** Descriptive text for the rehandshake option */
+#define REHANDSHAKE_DESC (gnutls_cli_opt_strs+1351)
+/** Upper-cased name for the rehandshake option */
+#define REHANDSHAKE_NAME (gnutls_cli_opt_strs+1387)
+/** Name string for the rehandshake option */
+#define REHANDSHAKE_name (gnutls_cli_opt_strs+1399)
+/** Compiled in flag settings for the rehandshake option */
#define REHANDSHAKE_FLAGS (OPTST_DISABLED)
-/*
+/**
* noticket option description:
*/
-#define NOTICKET_DESC (gnutls_cli_opt_strs+1415)
-#define NOTICKET_NAME (gnutls_cli_opt_strs+1444)
-#define NOTICKET_name (gnutls_cli_opt_strs+1453)
+/** Descriptive text for the noticket option */
+#define NOTICKET_DESC (gnutls_cli_opt_strs+1411)
+/** Upper-cased name for the noticket option */
+#define NOTICKET_NAME (gnutls_cli_opt_strs+1440)
+/** Name string for the noticket option */
+#define NOTICKET_name (gnutls_cli_opt_strs+1449)
+/** Compiled in flag settings for the noticket option */
#define NOTICKET_FLAGS (OPTST_DISABLED)
-/*
+/**
* starttls option description:
*/
-#define STARTTLS_DESC (gnutls_cli_opt_strs+1462)
-#define STARTTLS_NAME (gnutls_cli_opt_strs+1512)
-#define STARTTLS_name (gnutls_cli_opt_strs+1521)
+/** Descriptive text for the starttls option */
+#define STARTTLS_DESC (gnutls_cli_opt_strs+1458)
+/** Upper-cased name for the starttls option */
+#define STARTTLS_NAME (gnutls_cli_opt_strs+1508)
+/** Name string for the starttls option */
+#define STARTTLS_name (gnutls_cli_opt_strs+1517)
+/** Compiled in flag settings for the starttls option */
#define STARTTLS_FLAGS (OPTST_DISABLED)
-/*
+/**
* udp option description:
*/
-#define UDP_DESC (gnutls_cli_opt_strs+1530)
-#define UDP_NAME (gnutls_cli_opt_strs+1563)
-#define UDP_name (gnutls_cli_opt_strs+1567)
+/** Descriptive text for the udp option */
+#define UDP_DESC (gnutls_cli_opt_strs+1526)
+/** Upper-cased name for the udp option */
+#define UDP_NAME (gnutls_cli_opt_strs+1559)
+/** Name string for the udp option */
+#define UDP_name (gnutls_cli_opt_strs+1563)
+/** Compiled in flag settings for the udp option */
#define UDP_FLAGS (OPTST_DISABLED)
-/*
+/**
* mtu option description:
*/
-#define MTU_DESC (gnutls_cli_opt_strs+1571)
-#define MTU_NAME (gnutls_cli_opt_strs+1596)
-#define MTU_name (gnutls_cli_opt_strs+1600)
+/** Descriptive text for the mtu option */
+#define MTU_DESC (gnutls_cli_opt_strs+1567)
+/** Upper-cased name for the mtu option */
+#define MTU_NAME (gnutls_cli_opt_strs+1592)
+/** Name string for the mtu option */
+#define MTU_name (gnutls_cli_opt_strs+1596)
+/** Compiled in flag settings for the mtu option */
#define MTU_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* srtp_profiles option description:
*/
-#define SRTP_PROFILES_DESC (gnutls_cli_opt_strs+1604)
-#define SRTP_PROFILES_NAME (gnutls_cli_opt_strs+1624)
-#define SRTP_PROFILES_name (gnutls_cli_opt_strs+1638)
+/** Descriptive text for the srtp_profiles option */
+#define SRTP_PROFILES_DESC (gnutls_cli_opt_strs+1600)
+/** Upper-cased name for the srtp_profiles option */
+#define SRTP_PROFILES_NAME (gnutls_cli_opt_strs+1620)
+/** Name string for the srtp_profiles option */
+#define SRTP_PROFILES_name (gnutls_cli_opt_strs+1634)
+/** Compiled in flag settings for the srtp_profiles option */
#define SRTP_PROFILES_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* crlf option description:
*/
-#define CRLF_DESC (gnutls_cli_opt_strs+1652)
-#define CRLF_NAME (gnutls_cli_opt_strs+1677)
-#define CRLF_name (gnutls_cli_opt_strs+1682)
+/** Descriptive text for the crlf option */
+#define CRLF_DESC (gnutls_cli_opt_strs+1648)
+/** Upper-cased name for the crlf option */
+#define CRLF_NAME (gnutls_cli_opt_strs+1673)
+/** Name string for the crlf option */
+#define CRLF_name (gnutls_cli_opt_strs+1678)
+/** Compiled in flag settings for the crlf option */
#define CRLF_FLAGS (OPTST_DISABLED)
-/*
+/**
* x509fmtder option description:
*/
-#define X509FMTDER_DESC (gnutls_cli_opt_strs+1687)
-#define X509FMTDER_NAME (gnutls_cli_opt_strs+1732)
-#define X509FMTDER_name (gnutls_cli_opt_strs+1743)
+/** Descriptive text for the x509fmtder option */
+#define X509FMTDER_DESC (gnutls_cli_opt_strs+1683)
+/** Upper-cased name for the x509fmtder option */
+#define X509FMTDER_NAME (gnutls_cli_opt_strs+1728)
+/** Name string for the x509fmtder option */
+#define X509FMTDER_name (gnutls_cli_opt_strs+1739)
+/** Compiled in flag settings for the x509fmtder option */
#define X509FMTDER_FLAGS (OPTST_DISABLED)
-/*
+/**
* fingerprint option description:
*/
-#define FINGERPRINT_DESC (gnutls_cli_opt_strs+1754)
-#define FINGERPRINT_NAME (gnutls_cli_opt_strs+1803)
-#define FINGERPRINT_name (gnutls_cli_opt_strs+1815)
+/** Descriptive text for the fingerprint option */
+#define FINGERPRINT_DESC (gnutls_cli_opt_strs+1750)
+/** Upper-cased name for the fingerprint option */
+#define FINGERPRINT_NAME (gnutls_cli_opt_strs+1799)
+/** Name string for the fingerprint option */
+#define FINGERPRINT_name (gnutls_cli_opt_strs+1811)
+/** Compiled in flag settings for the fingerprint option */
#define FINGERPRINT_FLAGS (OPTST_DISABLED)
-/*
+/**
* disable-extensions option description:
*/
-#define DISABLE_EXTENSIONS_DESC (gnutls_cli_opt_strs+1827)
-#define DISABLE_EXTENSIONS_NAME (gnutls_cli_opt_strs+1858)
-#define DISABLE_EXTENSIONS_name (gnutls_cli_opt_strs+1877)
+/** Descriptive text for the disable-extensions option */
+#define DISABLE_EXTENSIONS_DESC (gnutls_cli_opt_strs+1823)
+/** Upper-cased name for the disable-extensions option */
+#define DISABLE_EXTENSIONS_NAME (gnutls_cli_opt_strs+1854)
+/** Name string for the disable-extensions option */
+#define DISABLE_EXTENSIONS_name (gnutls_cli_opt_strs+1873)
+/** Compiled in flag settings for the disable-extensions option */
#define DISABLE_EXTENSIONS_FLAGS (OPTST_DISABLED)
-/*
+/**
* print-cert option description:
*/
-#define PRINT_CERT_DESC (gnutls_cli_opt_strs+1896)
-#define PRINT_CERT_NAME (gnutls_cli_opt_strs+1935)
-#define PRINT_CERT_name (gnutls_cli_opt_strs+1946)
+/** Descriptive text for the print-cert option */
+#define PRINT_CERT_DESC (gnutls_cli_opt_strs+1892)
+/** Upper-cased name for the print-cert option */
+#define PRINT_CERT_NAME (gnutls_cli_opt_strs+1931)
+/** Name string for the print-cert option */
+#define PRINT_CERT_name (gnutls_cli_opt_strs+1942)
+/** Compiled in flag settings for the print-cert option */
#define PRINT_CERT_FLAGS (OPTST_DISABLED)
-/*
+/**
* recordsize option description:
*/
-#define RECORDSIZE_DESC (gnutls_cli_opt_strs+1957)
-#define RECORDSIZE_NAME (gnutls_cli_opt_strs+1994)
-#define RECORDSIZE_name (gnutls_cli_opt_strs+2005)
+/** Descriptive text for the recordsize option */
+#define RECORDSIZE_DESC (gnutls_cli_opt_strs+1953)
+/** Upper-cased name for the recordsize option */
+#define RECORDSIZE_NAME (gnutls_cli_opt_strs+1990)
+/** Name string for the recordsize option */
+#define RECORDSIZE_name (gnutls_cli_opt_strs+2001)
+/** Compiled in flag settings for the recordsize option */
#define RECORDSIZE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* dh-bits option description:
*/
-#define DH_BITS_DESC (gnutls_cli_opt_strs+2016)
-#define DH_BITS_NAME (gnutls_cli_opt_strs+2058)
-#define DH_BITS_name (gnutls_cli_opt_strs+2066)
+/** Descriptive text for the dh-bits option */
+#define DH_BITS_DESC (gnutls_cli_opt_strs+2012)
+/** Upper-cased name for the dh-bits option */
+#define DH_BITS_NAME (gnutls_cli_opt_strs+2054)
+/** Name string for the dh-bits option */
+#define DH_BITS_name (gnutls_cli_opt_strs+2062)
+/** Compiled in flag settings for the dh-bits option */
#define DH_BITS_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* priority option description:
*/
-#define PRIORITY_DESC (gnutls_cli_opt_strs+2074)
-#define PRIORITY_NAME (gnutls_cli_opt_strs+2092)
-#define PRIORITY_name (gnutls_cli_opt_strs+2101)
+/** Descriptive text for the priority option */
+#define PRIORITY_DESC (gnutls_cli_opt_strs+2070)
+/** Upper-cased name for the priority option */
+#define PRIORITY_NAME (gnutls_cli_opt_strs+2088)
+/** Name string for the priority option */
+#define PRIORITY_name (gnutls_cli_opt_strs+2097)
+/** Compiled in flag settings for the priority option */
#define PRIORITY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* x509cafile option description:
*/
-#define X509CAFILE_DESC (gnutls_cli_opt_strs+2110)
-#define X509CAFILE_NAME (gnutls_cli_opt_strs+2150)
-#define X509CAFILE_name (gnutls_cli_opt_strs+2161)
+/** Descriptive text for the x509cafile option */
+#define X509CAFILE_DESC (gnutls_cli_opt_strs+2106)
+/** Upper-cased name for the x509cafile option */
+#define X509CAFILE_NAME (gnutls_cli_opt_strs+2146)
+/** Name string for the x509cafile option */
+#define X509CAFILE_name (gnutls_cli_opt_strs+2157)
+/** Compiled in flag settings for the x509cafile option */
#define X509CAFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* x509crlfile option description:
*/
-#define X509CRLFILE_DESC (gnutls_cli_opt_strs+2172)
-#define X509CRLFILE_NAME (gnutls_cli_opt_strs+2188)
-#define X509CRLFILE_name (gnutls_cli_opt_strs+2200)
+/** Descriptive text for the x509crlfile option */
+#define X509CRLFILE_DESC (gnutls_cli_opt_strs+2168)
+/** Upper-cased name for the x509crlfile option */
+#define X509CRLFILE_NAME (gnutls_cli_opt_strs+2184)
+/** Name string for the x509crlfile option */
+#define X509CRLFILE_name (gnutls_cli_opt_strs+2196)
+/** Compiled in flag settings for the x509crlfile option */
#define X509CRLFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* pgpkeyfile option description:
*/
-#define PGPKEYFILE_DESC (gnutls_cli_opt_strs+2212)
-#define PGPKEYFILE_NAME (gnutls_cli_opt_strs+2232)
-#define PGPKEYFILE_name (gnutls_cli_opt_strs+2243)
+/** Descriptive text for the pgpkeyfile option */
+#define PGPKEYFILE_DESC (gnutls_cli_opt_strs+2208)
+/** Upper-cased name for the pgpkeyfile option */
+#define PGPKEYFILE_NAME (gnutls_cli_opt_strs+2228)
+/** Name string for the pgpkeyfile option */
+#define PGPKEYFILE_name (gnutls_cli_opt_strs+2239)
+/** Compiled in flag settings for the pgpkeyfile option */
#define PGPKEYFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* pgpkeyring option description:
*/
-#define PGPKEYRING_DESC (gnutls_cli_opt_strs+2254)
-#define PGPKEYRING_NAME (gnutls_cli_opt_strs+2279)
-#define PGPKEYRING_name (gnutls_cli_opt_strs+2290)
+/** Descriptive text for the pgpkeyring option */
+#define PGPKEYRING_DESC (gnutls_cli_opt_strs+2250)
+/** Upper-cased name for the pgpkeyring option */
+#define PGPKEYRING_NAME (gnutls_cli_opt_strs+2275)
+/** Name string for the pgpkeyring option */
+#define PGPKEYRING_name (gnutls_cli_opt_strs+2286)
+/** Compiled in flag settings for the pgpkeyring option */
#define PGPKEYRING_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* pgpcertfile option description:
*/
-#define PGPCERTFILE_DESC (gnutls_cli_opt_strs+2301)
-#define PGPCERTFILE_NAME (gnutls_cli_opt_strs+2342)
-#define PGPCERTFILE_name (gnutls_cli_opt_strs+2354)
+/** Descriptive text for the pgpcertfile option */
+#define PGPCERTFILE_DESC (gnutls_cli_opt_strs+2297)
+/** Upper-cased name for the pgpcertfile option */
+#define PGPCERTFILE_NAME (gnutls_cli_opt_strs+2338)
+/** Name string for the pgpcertfile option */
+#define PGPCERTFILE_name (gnutls_cli_opt_strs+2350)
+/** Compiled in flag settings for the pgpcertfile option */
#define PGPCERTFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* x509keyfile option description:
*/
-#define X509KEYFILE_DESC (gnutls_cli_opt_strs+2366)
-#define X509KEYFILE_NAME (gnutls_cli_opt_strs+2404)
-#define X509KEYFILE_name (gnutls_cli_opt_strs+2416)
+/** Descriptive text for the x509keyfile option */
+#define X509KEYFILE_DESC (gnutls_cli_opt_strs+2362)
+/** Upper-cased name for the x509keyfile option */
+#define X509KEYFILE_NAME (gnutls_cli_opt_strs+2400)
+/** Name string for the x509keyfile option */
+#define X509KEYFILE_name (gnutls_cli_opt_strs+2412)
+/** Compiled in flag settings for the x509keyfile option */
#define X509KEYFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* x509certfile option description:
*/
-#define X509CERTFILE_DESC (gnutls_cli_opt_strs+2428)
-#define X509CERTFILE_NAME (gnutls_cli_opt_strs+2474)
-#define X509CERTFILE_name (gnutls_cli_opt_strs+2487)
+/** Descriptive text for the x509certfile option */
+#define X509CERTFILE_DESC (gnutls_cli_opt_strs+2424)
+/** Upper-cased name for the x509certfile option */
+#define X509CERTFILE_NAME (gnutls_cli_opt_strs+2470)
+/** Name string for the x509certfile option */
+#define X509CERTFILE_name (gnutls_cli_opt_strs+2483)
+/** Compiled in flag settings for the x509certfile option */
#define X509CERTFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* pgpsubkey option description:
*/
-#define PGPSUBKEY_DESC (gnutls_cli_opt_strs+2500)
-#define PGPSUBKEY_NAME (gnutls_cli_opt_strs+2532)
-#define PGPSUBKEY_name (gnutls_cli_opt_strs+2542)
+/** Descriptive text for the pgpsubkey option */
+#define PGPSUBKEY_DESC (gnutls_cli_opt_strs+2496)
+/** Upper-cased name for the pgpsubkey option */
+#define PGPSUBKEY_NAME (gnutls_cli_opt_strs+2528)
+/** Name string for the pgpsubkey option */
+#define PGPSUBKEY_name (gnutls_cli_opt_strs+2538)
+/** Compiled in flag settings for the pgpsubkey option */
#define PGPSUBKEY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* srpusername option description:
*/
-#define SRPUSERNAME_DESC (gnutls_cli_opt_strs+2552)
-#define SRPUSERNAME_NAME (gnutls_cli_opt_strs+2572)
-#define SRPUSERNAME_name (gnutls_cli_opt_strs+2584)
+/** Descriptive text for the srpusername option */
+#define SRPUSERNAME_DESC (gnutls_cli_opt_strs+2548)
+/** Upper-cased name for the srpusername option */
+#define SRPUSERNAME_NAME (gnutls_cli_opt_strs+2568)
+/** Name string for the srpusername option */
+#define SRPUSERNAME_name (gnutls_cli_opt_strs+2580)
+/** Compiled in flag settings for the srpusername option */
#define SRPUSERNAME_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* srppasswd option description:
*/
-#define SRPPASSWD_DESC (gnutls_cli_opt_strs+2596)
-#define SRPPASSWD_NAME (gnutls_cli_opt_strs+2616)
-#define SRPPASSWD_name (gnutls_cli_opt_strs+2626)
+/** Descriptive text for the srppasswd option */
+#define SRPPASSWD_DESC (gnutls_cli_opt_strs+2592)
+/** Upper-cased name for the srppasswd option */
+#define SRPPASSWD_NAME (gnutls_cli_opt_strs+2612)
+/** Name string for the srppasswd option */
+#define SRPPASSWD_name (gnutls_cli_opt_strs+2622)
+/** Compiled in flag settings for the srppasswd option */
#define SRPPASSWD_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* pskusername option description:
*/
-#define PSKUSERNAME_DESC (gnutls_cli_opt_strs+2636)
-#define PSKUSERNAME_NAME (gnutls_cli_opt_strs+2656)
-#define PSKUSERNAME_name (gnutls_cli_opt_strs+2668)
+/** Descriptive text for the pskusername option */
+#define PSKUSERNAME_DESC (gnutls_cli_opt_strs+2632)
+/** Upper-cased name for the pskusername option */
+#define PSKUSERNAME_NAME (gnutls_cli_opt_strs+2652)
+/** Name string for the pskusername option */
+#define PSKUSERNAME_name (gnutls_cli_opt_strs+2664)
+/** Compiled in flag settings for the pskusername option */
#define PSKUSERNAME_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* pskkey option description:
*/
-#define PSKKEY_DESC (gnutls_cli_opt_strs+2680)
-#define PSKKEY_NAME (gnutls_cli_opt_strs+2704)
-#define PSKKEY_name (gnutls_cli_opt_strs+2711)
+/** Descriptive text for the pskkey option */
+#define PSKKEY_DESC (gnutls_cli_opt_strs+2676)
+/** Upper-cased name for the pskkey option */
+#define PSKKEY_NAME (gnutls_cli_opt_strs+2700)
+/** Name string for the pskkey option */
+#define PSKKEY_name (gnutls_cli_opt_strs+2707)
+/** Compiled in flag settings for the pskkey option */
#define PSKKEY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* port option description:
*/
-#define PORT_DESC (gnutls_cli_opt_strs+2718)
-#define PORT_NAME (gnutls_cli_opt_strs+2752)
-#define PORT_name (gnutls_cli_opt_strs+2757)
+/** Descriptive text for the port option */
+#define PORT_DESC (gnutls_cli_opt_strs+2714)
+/** Upper-cased name for the port option */
+#define PORT_NAME (gnutls_cli_opt_strs+2748)
+/** Name string for the port option */
+#define PORT_name (gnutls_cli_opt_strs+2753)
+/** Compiled in flag settings for the port option */
#define PORT_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* insecure option description:
*/
-#define INSECURE_DESC (gnutls_cli_opt_strs+2762)
-#define INSECURE_NAME (gnutls_cli_opt_strs+2823)
-#define INSECURE_name (gnutls_cli_opt_strs+2832)
+/** Descriptive text for the insecure option */
+#define INSECURE_DESC (gnutls_cli_opt_strs+2758)
+/** Upper-cased name for the insecure option */
+#define INSECURE_NAME (gnutls_cli_opt_strs+2819)
+/** Name string for the insecure option */
+#define INSECURE_name (gnutls_cli_opt_strs+2828)
+/** Compiled in flag settings for the insecure option */
#define INSECURE_FLAGS (OPTST_DISABLED)
-/*
+/**
* ranges option description:
*/
-#define RANGES_DESC (gnutls_cli_opt_strs+2841)
-#define RANGES_NAME (gnutls_cli_opt_strs+2895)
-#define RANGES_name (gnutls_cli_opt_strs+2902)
+/** Descriptive text for the ranges option */
+#define RANGES_DESC (gnutls_cli_opt_strs+2837)
+/** Upper-cased name for the ranges option */
+#define RANGES_NAME (gnutls_cli_opt_strs+2891)
+/** Name string for the ranges option */
+#define RANGES_name (gnutls_cli_opt_strs+2898)
+/** Compiled in flag settings for the ranges option */
#define RANGES_FLAGS (OPTST_DISABLED)
-/*
+/**
* benchmark-ciphers option description:
*/
-#define BENCHMARK_CIPHERS_DESC (gnutls_cli_opt_strs+2909)
-#define BENCHMARK_CIPHERS_NAME (gnutls_cli_opt_strs+2938)
-#define BENCHMARK_CIPHERS_name (gnutls_cli_opt_strs+2956)
+/** Descriptive text for the benchmark-ciphers option */
+#define BENCHMARK_CIPHERS_DESC (gnutls_cli_opt_strs+2905)
+/** Upper-cased name for the benchmark-ciphers option */
+#define BENCHMARK_CIPHERS_NAME (gnutls_cli_opt_strs+2934)
+/** Name string for the benchmark-ciphers option */
+#define BENCHMARK_CIPHERS_name (gnutls_cli_opt_strs+2952)
+/** Compiled in flag settings for the benchmark-ciphers option */
#define BENCHMARK_CIPHERS_FLAGS (OPTST_DISABLED)
-/*
+/**
* benchmark-soft-ciphers option description:
*/
-#define BENCHMARK_SOFT_CIPHERS_DESC (gnutls_cli_opt_strs+2974)
-#define BENCHMARK_SOFT_CIPHERS_NAME (gnutls_cli_opt_strs+3033)
-#define BENCHMARK_SOFT_CIPHERS_name (gnutls_cli_opt_strs+3056)
+/** Descriptive text for the benchmark-soft-ciphers option */
+#define BENCHMARK_SOFT_CIPHERS_DESC (gnutls_cli_opt_strs+2970)
+/** Upper-cased name for the benchmark-soft-ciphers option */
+#define BENCHMARK_SOFT_CIPHERS_NAME (gnutls_cli_opt_strs+3029)
+/** Name string for the benchmark-soft-ciphers option */
+#define BENCHMARK_SOFT_CIPHERS_name (gnutls_cli_opt_strs+3052)
+/** Compiled in flag settings for the benchmark-soft-ciphers option */
#define BENCHMARK_SOFT_CIPHERS_FLAGS (OPTST_DISABLED)
-/*
+/**
* benchmark-tls-kx option description:
*/
-#define BENCHMARK_TLS_KX_DESC (gnutls_cli_opt_strs+3079)
-#define BENCHMARK_TLS_KX_NAME (gnutls_cli_opt_strs+3114)
-#define BENCHMARK_TLS_KX_name (gnutls_cli_opt_strs+3131)
+/** Descriptive text for the benchmark-tls-kx option */
+#define BENCHMARK_TLS_KX_DESC (gnutls_cli_opt_strs+3075)
+/** Upper-cased name for the benchmark-tls-kx option */
+#define BENCHMARK_TLS_KX_NAME (gnutls_cli_opt_strs+3110)
+/** Name string for the benchmark-tls-kx option */
+#define BENCHMARK_TLS_KX_name (gnutls_cli_opt_strs+3127)
+/** Compiled in flag settings for the benchmark-tls-kx option */
#define BENCHMARK_TLS_KX_FLAGS (OPTST_DISABLED)
-/*
+/**
* benchmark-tls-ciphers option description:
*/
-#define BENCHMARK_TLS_CIPHERS_DESC (gnutls_cli_opt_strs+3148)
-#define BENCHMARK_TLS_CIPHERS_NAME (gnutls_cli_opt_strs+3170)
-#define BENCHMARK_TLS_CIPHERS_name (gnutls_cli_opt_strs+3192)
+/** Descriptive text for the benchmark-tls-ciphers option */
+#define BENCHMARK_TLS_CIPHERS_DESC (gnutls_cli_opt_strs+3144)
+/** Upper-cased name for the benchmark-tls-ciphers option */
+#define BENCHMARK_TLS_CIPHERS_NAME (gnutls_cli_opt_strs+3166)
+/** Name string for the benchmark-tls-ciphers option */
+#define BENCHMARK_TLS_CIPHERS_name (gnutls_cli_opt_strs+3188)
+/** Compiled in flag settings for the benchmark-tls-ciphers option */
#define BENCHMARK_TLS_CIPHERS_FLAGS (OPTST_DISABLED)
-/*
+/**
* list option description:
*/
-#define LIST_DESC (gnutls_cli_opt_strs+3214)
-#define LIST_NAME (gnutls_cli_opt_strs+3265)
-#define LIST_name (gnutls_cli_opt_strs+3270)
+/** Descriptive text for the list option */
+#define LIST_DESC (gnutls_cli_opt_strs+3210)
+/** Upper-cased name for the list option */
+#define LIST_NAME (gnutls_cli_opt_strs+3261)
+/** Name string for the list option */
+#define LIST_name (gnutls_cli_opt_strs+3266)
+/** Compiled in flag settings for the list option */
#define LIST_FLAGS (OPTST_DISABLED)
-/*
+/**
* disable-sni option description:
*/
-#define DISABLE_SNI_DESC (gnutls_cli_opt_strs+3275)
-#define DISABLE_SNI_NAME (gnutls_cli_opt_strs+3318)
-#define DISABLE_SNI_name (gnutls_cli_opt_strs+3330)
+/** Descriptive text for the disable-sni option */
+#define DISABLE_SNI_DESC (gnutls_cli_opt_strs+3271)
+/** Upper-cased name for the disable-sni option */
+#define DISABLE_SNI_NAME (gnutls_cli_opt_strs+3314)
+/** Name string for the disable-sni option */
+#define DISABLE_SNI_name (gnutls_cli_opt_strs+3326)
+/** Compiled in flag settings for the disable-sni option */
#define DISABLE_SNI_FLAGS (OPTST_DISABLED)
/*
* Help/More_Help/Version option descriptions:
*/
-#define HELP_DESC (gnutls_cli_opt_strs+3342)
-#define HELP_name (gnutls_cli_opt_strs+3386)
+#define HELP_DESC (gnutls_cli_opt_strs+3338)
+#define HELP_name (gnutls_cli_opt_strs+3382)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (gnutls_cli_opt_strs+3391)
-#define MORE_HELP_name (gnutls_cli_opt_strs+3436)
+#define MORE_HELP_DESC (gnutls_cli_opt_strs+3387)
+#define MORE_HELP_name (gnutls_cli_opt_strs+3432)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC NULL
@@ -637,9 +817,9 @@ static char const gnutls_cli_opt_strs[3921] =
# define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
#endif
-#define VER_DESC (gnutls_cli_opt_strs+3446)
-#define VER_name (gnutls_cli_opt_strs+3482)
-/*
+#define VER_DESC (gnutls_cli_opt_strs+3442)
+#define VER_name (gnutls_cli_opt_strs+3478)
+/**
* Declare option callback procedures
*/
extern tOptProc
@@ -1191,7 +1371,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, 0,
+ /* opt state flags */ VER_FLAGS, AOUSE_VERSION,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -1205,7 +1385,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, 0,
+ /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -1217,7 +1397,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, 0,
+ /* opt state flags */ MORE_HELP_FLAGS, AOUSE_MORE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -1227,19 +1407,24 @@ static tOptDesc optDesc[OPTION_CT] = {
};
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Define the gnutls-cli Option Environment
- */
-#define zPROGNAME (gnutls_cli_opt_strs+3490)
-#define zUsageTitle (gnutls_cli_opt_strs+3501)
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/** Reference to the upper cased version of gnutls-cli. */
+#define zPROGNAME (gnutls_cli_opt_strs+3486)
+/** Reference to the title line for gnutls-cli usage. */
+#define zUsageTitle (gnutls_cli_opt_strs+3497)
+/** There is no gnutls-cli configuration file. */
#define zRcName NULL
+/** There are no directories to search for gnutls-cli config files. */
#define apzHomeList NULL
-#define zBugsAddr (gnutls_cli_opt_strs+3614)
-#define zExplain (gnutls_cli_opt_strs+3633)
-#define zDetail (gnutls_cli_opt_strs+3636)
-#define zFullVersion (gnutls_cli_opt_strs+3820)
-/* extracted from optcode.tlib near line 350 */
+/** The gnutls-cli program bug email address. */
+#define zBugsAddr (gnutls_cli_opt_strs+3593)
+/** Clarification/explanation of what gnutls-cli does. */
+#define zExplain (gnutls_cli_opt_strs+3612)
+/** Extra detail explaining what gnutls-cli does. */
+#define zDetail (gnutls_cli_opt_strs+3614)
+/** The full version string for gnutls-cli. */
+#define zFullVersion (gnutls_cli_opt_strs+3797)
+/* extracted from optcode.tlib near line 371 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT
@@ -1249,10 +1434,8 @@ static tOptDesc optDesc[OPTION_CT] = {
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
-
#define gnutls_cli_full_usage (NULL)
-
-#define gnutls_cli_short_usage (gnutls_cli_opt_strs+3841)
+#define gnutls_cli_short_usage (gnutls_cli_opt_strs+3818)
#endif /* not defined __doxygen__ */
@@ -1262,8 +1445,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/**
* The callout function that invokes the optionUsage function.
*
- * @param pOptions the AutoOpts option description structure
- * @param pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] pOptions the AutoOpts option description structure
+ * @param[in] pOptDesc the descriptor for the "help" (usage) option.
* @noreturn
*/
static void
@@ -1278,9 +1461,9 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Code to handle the debug option.
- *
- * @param pOptions the gnutls-cli options data structure
- * @param pOptDesc the option descriptor for this option.
+ * Specifies the debug level.
+ * @param[in] pOptions the gnutls-cli options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1306,8 +1489,7 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
@@ -1315,8 +1497,8 @@ emit_ranges:
/**
* Code to handle the mtu option.
*
- * @param pOptions the gnutls-cli options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-cli options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptMtu(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1342,8 +1524,7 @@ doOptMtu(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
@@ -1351,8 +1532,8 @@ emit_ranges:
/**
* Code to handle the recordsize option.
*
- * @param pOptions the gnutls-cli options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-cli options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptRecordsize(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1378,8 +1559,7 @@ doOptRecordsize(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
@@ -1387,8 +1567,8 @@ emit_ranges:
/**
* Code to handle the x509crlfile option.
*
- * @param pOptions the gnutls-cli options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-cli options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptX509crlfile(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1401,6 +1581,9 @@ doOptX509crlfile(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1408,8 +1591,8 @@ doOptX509crlfile(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the pgpkeyfile option.
*
- * @param pOptions the gnutls-cli options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-cli options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptPgpkeyfile(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1422,6 +1605,9 @@ doOptPgpkeyfile(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1429,8 +1615,8 @@ doOptPgpkeyfile(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the pgpkeyring option.
*
- * @param pOptions the gnutls-cli options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-cli options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptPgpkeyring(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1443,6 +1629,9 @@ doOptPgpkeyring(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1450,8 +1639,8 @@ doOptPgpkeyring(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the pgpcertfile option.
*
- * @param pOptions the gnutls-cli options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-cli options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptPgpcertfile(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1464,9 +1653,12 @@ doOptPgpcertfile(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
-/* extracted from optmain.tlib near line 1113 */
+/* extracted from optmain.tlib near line 1254 */
/**
* The directory containing the data associated with gnutls-cli.
@@ -1482,6 +1674,7 @@ doOptPgpcertfile(tOptions* pOptions, tOptDesc* pOptDesc)
#ifndef WITH_PACKAGER
# define gnutls_cli_packager_info NULL
#else
+/** Packager information for gnutls-cli. */
static char const gnutls_cli_packager_info[] =
"Packaged by " WITH_PACKAGER
@@ -1537,42 +1730,69 @@ tOptions gnutls_cliOptions = {
};
#if ENABLE_NLS
+/**
+ * This code is designed to translate translatable option text for the
+ * gnutls-cli program. These translations happen upon entry
+ * to optionProcess().
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
#include <autoopts/usage-txt.h>
-static char* AO_gettext(char const* pz);
-static void coerce_it(void** s);
+static char * AO_gettext(char const * pz);
+static void coerce_it(void ** s);
/**
- * AutoGen specific wrapper function for gettext.
- * It relies on the macro _() to convert from English to the target
- * language, then strdup-duplicates the result string.
+ * AutoGen specific wrapper function for gettext. It relies on the macro _()
+ * to convert from English to the target language, then strdup-duplicates the
+ * result string. It tries the "libopts" domain first, then whatever has been
+ * set via the \a textdomain(3) call.
*
* @param[in] pz the input text used as a lookup key.
* @returns the translated text (if there is one),
* or the original text (if not).
*/
static char *
-AO_gettext(char const* pz)
+AO_gettext(char const * pz)
{
- char* pzRes;
+ char * res;
if (pz == NULL)
return NULL;
- pzRes = _(pz);
- if (pzRes == pz)
- return pzRes;
- pzRes = strdup(pzRes);
- if (pzRes == NULL) {
+#ifdef HAVE_DCGETTEXT
+ /*
+ * While processing the option_xlateable_txt data, try to use the
+ * "libopts" domain. Once we switch to the option descriptor data,
+ * do *not* use that domain.
+ */
+ if (option_xlateable_txt.field_ct != 0) {
+ res = dgettext("libopts", pz);
+ if (res == pz)
+ res = (char *)(void *)_(pz);
+ } else
+ res = (char *)(void *)_(pz);
+#else
+ res = (char *)(void *)_(pz);
+#endif
+ if (res == pz)
+ return res;
+ res = strdup(res);
+ if (res == NULL) {
fputs(_("No memory for duping translated strings\n"), stderr);
exit(GNUTLS_CLI_EXIT_FAILURE);
}
- return pzRes;
+ return res;
}
-static void coerce_it(void** s) { *s = AO_gettext(*s);
+/**
+ * All the pointers we use are marked "* const", but they are stored in
+ * writable memory. Coerce the mutability and set the pointer.
+ */
+static void coerce_it(void ** s) { *s = AO_gettext(*s);
}
/**
@@ -1582,56 +1802,535 @@ static void coerce_it(void** s) { *s = AO_gettext(*s);
static void
translate_option_strings(void)
{
- tOptions * const pOpt = &gnutls_cliOptions;
+ tOptions * const opts = &gnutls_cliOptions;
/*
* Guard against re-translation. It won't work. The strings will have
* been changed by the first pass through this code. One shot only.
*/
- if (option_usage_text.field_ct != 0) {
+ if (option_xlateable_txt.field_ct != 0) {
/*
* Do the translations. The first pointer follows the field count
* field. The field count field is the size of a pointer.
*/
- tOptDesc * pOD = pOpt->pOptDesc;
- char ** ppz = (char**)(void*)&(option_usage_text);
- int ix = option_usage_text.field_ct;
+ char ** ppz = (char**)(void*)&(option_xlateable_txt);
+ int ix = option_xlateable_txt.field_ct;
do {
- ppz++;
+ ppz++; /* skip over field_ct */
*ppz = AO_gettext(*ppz);
} while (--ix > 0);
-
- coerce_it((void*)&(pOpt->pzCopyright));
- coerce_it((void*)&(pOpt->pzCopyNotice));
- coerce_it((void*)&(pOpt->pzFullVersion));
- coerce_it((void*)&(pOpt->pzUsageTitle));
- coerce_it((void*)&(pOpt->pzExplain));
- coerce_it((void*)&(pOpt->pzDetail));
- coerce_it((void*)&(pOpt->pzPackager));
- coerce_it((void*)&(pOpt->pzShortUsage));
- option_usage_text.field_ct = 0;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++)
- coerce_it((void*)&(pOD->pzText));
- }
-
- if ((pOpt->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
- tOptDesc * pOD = pOpt->pOptDesc;
- int ix;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++) {
- coerce_it((void*)&(pOD->pz_Name));
- coerce_it((void*)&(pOD->pz_DisableName));
- coerce_it((void*)&(pOD->pz_DisablePfx));
+ /* prevent re-translation and disable "libopts" domain lookup */
+ option_xlateable_txt.field_ct = 0;
+
+ coerce_it((void*)&(opts->pzCopyright));
+ coerce_it((void*)&(opts->pzCopyNotice));
+ coerce_it((void*)&(opts->pzFullVersion));
+ 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));
}
- /* prevent re-translation */
- gnutls_cliOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
}
-
#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 gnutls_cliOptions structure noted in the comments below. The
+ literal text is defined in gnutls_cli_opt_strs.
+
+ NOTE: the strings below are segmented with respect to the source string
+ gnutls_cli_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 gnutls_cliOptions.pzCopyright */
+ puts(_("gnutls-cli @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 gnutls_cliOptions.pzCopyNotice */
+ puts(_("gnutls-cli 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(_("gnutls-cli is distributed in the hope that it will be useful, but WITHOUT\n\
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n\
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\n\
+more 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 gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Enable debugging."));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("More verbose output"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Enable trust on first use authentication"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Enable DANE certificate verification (DNSSEC)"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Use the local DNS server for DNSSEC resolving."));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Disable CA certificate verification"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Enable OCSP certificate verification"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Establish a session and resume"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Activate heartbeat support"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Establish a session and rehandshake"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Don't accept session tickets"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Connect, establish a plain session and start TLS."));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Use DTLS (datagram TLS) over UDP"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Set MTU for datagram TLS"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Offer SRTP profiles"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Send CR LF instead of LF"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Use DER format for certificates to read from"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Send the openpgp fingerprint, instead of the key"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Disable all the TLS extensions"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Print peer's certificate in PEM format"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("The maximum record size to advertize"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("The minimum number of bits allowed for DH"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Priorities string"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Certificate file or PKCS #11 URL to use"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("CRL file to use"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("PGP Key file to use"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("PGP Key ring file to use"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("PGP Public Key (certificate) file to use"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("X.509 key file or PKCS #11 URL to use"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("X.509 Certificate file or PKCS #11 URL to use"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("PGP subkey to use (hex or auto)"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("SRP username to use"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("SRP password to use"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("PSK username to use"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("PSK key (in hex) to use"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("The port or service to connect to"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Don't abort program if server certificate can't be validated"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Use length-hiding padding to prevent traffic analysis"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Benchmark individual ciphers"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Benchmark individual software ciphers (no hw acceleration)"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Benchmark TLS key exchange methods"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Benchmark TLS ciphers"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Print a list of the supported algorithms and modes"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Do not send a Server Name Indication (SNI)"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("display extended usage information and exit"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("extended usage information passed thru pager"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("output version information and exit"));
+
+ /* referenced via gnutls_cliOptions.pzUsageTitle */
+ puts(_("gnutls-cli - GnuTLS client\n\
+Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostname]\n"));
+
+ /* referenced via gnutls_cliOptions.pzExplain */
+ puts(_("\n"));
+
+ /* referenced via gnutls_cliOptions.pzDetail */
+ puts(_("Simple client program to set up a TLS connection to some other computer. It\n\
+sets up a TLS connection and forwards data from the standard input to the\n\
+secured socket and vice versa.\n"));
+
+ /* referenced via gnutls_cliOptions.pzFullVersion */
+ puts(_("gnutls-cli @VERSION@"));
+
+ /* referenced via gnutls_cliOptions.pzFullUsage */
+ puts(_("<<<NOT-FOUND>>>"));
+
+ /* referenced via gnutls_cliOptions.pzShortUsage */
+ puts(_("Usage: gnutls-cli [options] hostname\n\
+gnutls-cli --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/cli-args.h b/src/cli-args.h
index 0a9f8b955c..5d9a1c7152 100644
--- a/src/cli-args.h
+++ b/src/cli-args.h
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (cli-args.h)
- *
- * It has been AutoGen-ed February 1, 2013 at 08:10:51 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:17 PM by AutoGen 5.17.3
* From the definitions cli-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This header file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,24 +21,23 @@
*
* 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>
*
* gnutls-cli 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.
- *
+ *
* gnutls-cli 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 gnutls-cli program.
* These macros are documented in the AutoGen info file in the
@@ -49,22 +48,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 147460
+#define AO_TEMPLATE_VERSION 155648
#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:
+/**
+ * Enumeration of each option type for gnutls-cli
*/
typedef enum {
INDEX_OPT_DEBUG = 0,
@@ -115,44 +114,63 @@ typedef enum {
INDEX_OPT_HELP = 45,
INDEX_OPT_MORE_HELP = 46
} teOptIndex;
-
+/** count of all options for gnutls-cli */
#define OPTION_CT 47
+/** gnutls-cli version */
#define GNUTLS_CLI_VERSION "@VERSION@"
+/** Full gnutls-cli version text */
#define GNUTLS_CLI_FULL_VERSION "gnutls-cli @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) (gnutls_cliOptions.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 gnutls-cli exit codes
*/
typedef enum {
- GNUTLS_CLI_EXIT_SUCCESS = 0,
- GNUTLS_CLI_EXIT_FAILURE = 1,
+ GNUTLS_CLI_EXIT_SUCCESS = 0,
+ GNUTLS_CLI_EXIT_FAILURE = 1,
+ GNUTLS_CLI_EXIT_USAGE_ERROR = 64,
GNUTLS_CLI_EXIT_LIBOPTS_FAILURE = 70
} gnutls_cli_exit_code_t;
-/* * * * * *
- *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/**
* Interface defines for specific options.
+ * @{
*/
#define VALUE_OPT_DEBUG 'd'
@@ -206,8 +224,11 @@ typedef enum {
#define VALUE_OPT_BENCHMARK_TLS_CIPHERS 137
#define VALUE_OPT_LIST 'l'
#define VALUE_OPT_DISABLE_SNI 139
+/** 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
@@ -219,7 +240,7 @@ typedef enum {
gnutls_cliOptions.pzCurOpt = NULL)
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*gnutls_cliOptions.pUsageProc)(&gnutls_cliOptions, c)
-/* extracted from opthead.tlib near line 484 */
+/* extracted from opthead.tlib near line 538 */
#ifdef __cplusplus
extern "C" {
@@ -239,6 +260,12 @@ extern tOptions gnutls_cliOptions;
#if defined(ENABLE_NLS)
# ifndef _
# include <stdio.h>
+# ifndef HAVE_GETTEXT
+ extern char * gettext(char const *);
+# else
+# include <libintl.h>
+# endif
+
static inline char* aoGetsText(char const* pz) {
if (pz == NULL) return NULL;
return (char*)gettext(pz);
diff --git a/src/cli-debug-args.c b/src/cli-debug-args.c
index c841ff9a04..042f3d2ced 100644
--- a/src/cli-debug-args.c
+++ b/src/cli-debug-args.c
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (cli-debug-args.c)
- *
- * It has been AutoGen-ed November 8, 2012 at 11:35:50 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:16 PM by AutoGen 5.17.3
* From the definitions cli-debug-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This source file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,20 +21,19 @@
*
* 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>
*
* gnutls-cli-debug 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.
- *
+ *
* gnutls-cli-debug 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/>.
*/
@@ -53,28 +52,24 @@
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 (gnutls_cli_debug_opt_strs+0)
-#define zLicenseDescrip (gnutls_cli_debug_opt_strs+287)
+#define zLicenseDescrip (gnutls_cli_debug_opt_strs+283)
#ifndef NULL
# define NULL 0
#endif
-/*
- * gnutls-cli-debug option static const strings
+/**
+ * static const strings for gnutls-cli-debug options
*/
-static char const gnutls_cli_debug_opt_strs[1841] =
+static char const gnutls_cli_debug_opt_strs[1818] =
/* 0 */ "gnutls-cli-debug @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\n"
- "GNU General Public License, version 3 or later\n"
- " <http://gnu.org/licenses/gpl.html>\n\0"
-/* 287 */ "gnutls-cli-debug is free software: you can redistribute it and/or modify it\n"
+ "redistribution under the terms of the GNU General Public License,\n"
+ "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0"
+/* 283 */ "gnutls-cli-debug is free software: you can redistribute it and/or modify it\n"
"under 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"
@@ -84,71 +79,82 @@ static char const gnutls_cli_debug_opt_strs[1841] =
"for more 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"
-/* 908 */ "Enable debugging.\0"
-/* 926 */ "DEBUG\0"
-/* 932 */ "debug\0"
-/* 938 */ "More verbose output\0"
-/* 958 */ "VERBOSE\0"
-/* 966 */ "verbose\0"
-/* 974 */ "The port to connect to\0"
-/* 997 */ "PORT\0"
-/* 1002 */ "port\0"
-/* 1007 */ "Display extended usage information and exit\0"
-/* 1051 */ "help\0"
-/* 1056 */ "Extended usage information passed thru pager\0"
-/* 1101 */ "more-help\0"
-/* 1111 */ "Output version information and exit\0"
-/* 1147 */ "version\0"
-/* 1155 */ "GNUTLS_CLI_DEBUG\0"
-/* 1172 */ "gnutls-cli-debug - GnuTLS debug client - Ver. @VERSION@\n"
- "USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \n\0"
-/* 1287 */ "bug-gnutls@gnu.org\0"
-/* 1306 */ "\n\n\0"
-/* 1309 */ "\n"
- "TLS debug client. It sets up multiple TLS connections to a server and\n"
+/* 904 */ "Enable debugging.\0"
+/* 922 */ "DEBUG\0"
+/* 928 */ "debug\0"
+/* 934 */ "More verbose output\0"
+/* 954 */ "VERBOSE\0"
+/* 962 */ "verbose\0"
+/* 970 */ "The port to connect to\0"
+/* 993 */ "PORT\0"
+/* 998 */ "port\0"
+/* 1003 */ "display extended usage information and exit\0"
+/* 1047 */ "help\0"
+/* 1052 */ "extended usage information passed thru pager\0"
+/* 1097 */ "more-help\0"
+/* 1107 */ "output version information and exit\0"
+/* 1143 */ "version\0"
+/* 1151 */ "GNUTLS_CLI_DEBUG\0"
+/* 1168 */ "gnutls-cli-debug - GnuTLS debug client\n"
+ "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \n\0"
+/* 1266 */ "bug-gnutls@gnu.org\0"
+/* 1285 */ "\n\0"
+/* 1287 */ "TLS debug client. It sets up multiple TLS connections to a server and\n"
"queries its capabilities. It was created to assist in debugging GnuTLS,\n"
"but it might be useful to extract a TLS server's capabilities. It connects\n"
"to a TLS server, performs tests and print the server's capabilities. If\n"
"called with the `-v' parameter more checks will be performed. Can be used\n"
"to check for servers with special needs or bugs.\n\0"
-/* 1728 */ "gnutls-cli-debug @VERSION@\0"
-/* 1755 */ "Usage: gnutls-cli-debug [options] hostname\n"
+/* 1705 */ "gnutls-cli-debug @VERSION@\0"
+/* 1732 */ "Usage: gnutls-cli-debug [options] hostname\n"
"gnutls-cli --help for usage instructions.\n";
-/*
+/**
* debug option description:
*/
-#define DEBUG_DESC (gnutls_cli_debug_opt_strs+908)
-#define DEBUG_NAME (gnutls_cli_debug_opt_strs+926)
-#define DEBUG_name (gnutls_cli_debug_opt_strs+932)
+/** Descriptive text for the debug option */
+#define DEBUG_DESC (gnutls_cli_debug_opt_strs+904)
+/** Upper-cased name for the debug option */
+#define DEBUG_NAME (gnutls_cli_debug_opt_strs+922)
+/** Name string for the debug option */
+#define DEBUG_name (gnutls_cli_debug_opt_strs+928)
+/** Compiled in flag settings for the debug option */
#define DEBUG_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* verbose option description:
*/
-#define VERBOSE_DESC (gnutls_cli_debug_opt_strs+938)
-#define VERBOSE_NAME (gnutls_cli_debug_opt_strs+958)
-#define VERBOSE_name (gnutls_cli_debug_opt_strs+966)
+/** Descriptive text for the verbose option */
+#define VERBOSE_DESC (gnutls_cli_debug_opt_strs+934)
+/** Upper-cased name for the verbose option */
+#define VERBOSE_NAME (gnutls_cli_debug_opt_strs+954)
+/** Name string for the verbose option */
+#define VERBOSE_name (gnutls_cli_debug_opt_strs+962)
+/** Compiled in flag settings for the verbose option */
#define VERBOSE_FLAGS (OPTST_DISABLED)
-/*
+/**
* port option description:
*/
-#define PORT_DESC (gnutls_cli_debug_opt_strs+974)
-#define PORT_NAME (gnutls_cli_debug_opt_strs+997)
-#define PORT_name (gnutls_cli_debug_opt_strs+1002)
+/** Descriptive text for the port option */
+#define PORT_DESC (gnutls_cli_debug_opt_strs+970)
+/** Upper-cased name for the port option */
+#define PORT_NAME (gnutls_cli_debug_opt_strs+993)
+/** Name string for the port option */
+#define PORT_name (gnutls_cli_debug_opt_strs+998)
+/** Compiled in flag settings for the port option */
#define PORT_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
/*
* Help/More_Help/Version option descriptions:
*/
-#define HELP_DESC (gnutls_cli_debug_opt_strs+1007)
-#define HELP_name (gnutls_cli_debug_opt_strs+1051)
+#define HELP_DESC (gnutls_cli_debug_opt_strs+1003)
+#define HELP_name (gnutls_cli_debug_opt_strs+1047)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (gnutls_cli_debug_opt_strs+1056)
-#define MORE_HELP_name (gnutls_cli_debug_opt_strs+1101)
+#define MORE_HELP_DESC (gnutls_cli_debug_opt_strs+1052)
+#define MORE_HELP_name (gnutls_cli_debug_opt_strs+1097)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC NULL
@@ -161,9 +167,9 @@ static char const gnutls_cli_debug_opt_strs[1841] =
# define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
#endif
-#define VER_DESC (gnutls_cli_debug_opt_strs+1111)
-#define VER_name (gnutls_cli_debug_opt_strs+1147)
-/*
+#define VER_DESC (gnutls_cli_debug_opt_strs+1107)
+#define VER_name (gnutls_cli_debug_opt_strs+1143)
+/**
* Declare option callback procedures
*/
extern tOptProc
@@ -222,7 +228,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, 0,
+ /* opt state flags */ VER_FLAGS, AOUSE_VERSION,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -236,7 +242,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, 0,
+ /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -248,7 +254,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, 0,
+ /* opt state flags */ MORE_HELP_FLAGS, AOUSE_MORE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -258,19 +264,24 @@ static tOptDesc optDesc[OPTION_CT] = {
};
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Define the gnutls-cli-debug Option Environment
- */
-#define zPROGNAME (gnutls_cli_debug_opt_strs+1155)
-#define zUsageTitle (gnutls_cli_debug_opt_strs+1172)
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/** Reference to the upper cased version of gnutls-cli-debug. */
+#define zPROGNAME (gnutls_cli_debug_opt_strs+1151)
+/** Reference to the title line for gnutls-cli-debug usage. */
+#define zUsageTitle (gnutls_cli_debug_opt_strs+1168)
+/** There is no gnutls-cli-debug configuration file. */
#define zRcName NULL
+/** There are no directories to search for gnutls-cli-debug config files. */
#define apzHomeList NULL
-#define zBugsAddr (gnutls_cli_debug_opt_strs+1287)
-#define zExplain (gnutls_cli_debug_opt_strs+1306)
-#define zDetail (gnutls_cli_debug_opt_strs+1309)
-#define zFullVersion (gnutls_cli_debug_opt_strs+1728)
-/* extracted from optcode.tlib near line 350 */
+/** The gnutls-cli-debug program bug email address. */
+#define zBugsAddr (gnutls_cli_debug_opt_strs+1266)
+/** Clarification/explanation of what gnutls-cli-debug does. */
+#define zExplain (gnutls_cli_debug_opt_strs+1285)
+/** Extra detail explaining what gnutls-cli-debug does. */
+#define zDetail (gnutls_cli_debug_opt_strs+1287)
+/** The full version string for gnutls-cli-debug. */
+#define zFullVersion (gnutls_cli_debug_opt_strs+1705)
+/* extracted from optcode.tlib near line 371 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT
@@ -280,10 +291,8 @@ static tOptDesc optDesc[OPTION_CT] = {
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
-
#define gnutls_cli_debug_full_usage (NULL)
-
-#define gnutls_cli_debug_short_usage (gnutls_cli_debug_opt_strs+1755)
+#define gnutls_cli_debug_short_usage (gnutls_cli_debug_opt_strs+1732)
#endif /* not defined __doxygen__ */
@@ -293,8 +302,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/**
* The callout function that invokes the optionUsage function.
*
- * @param pOptions the AutoOpts option description structure
- * @param pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] pOptions the AutoOpts option description structure
+ * @param[in] pOptDesc the descriptor for the "help" (usage) option.
* @noreturn
*/
static void
@@ -309,9 +318,9 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Code to handle the debug option.
- *
- * @param pOptions the gnutls-cli-debug options data structure
- * @param pOptDesc the option descriptor for this option.
+ * Specifies the debug level.
+ * @param[in] pOptions the gnutls-cli-debug options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -337,8 +346,7 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
@@ -346,8 +354,8 @@ emit_ranges:
/**
* Code to handle the port option.
*
- * @param pOptions the gnutls-cli-debug options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-cli-debug options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptPort(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -373,11 +381,10 @@ doOptPort(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
-/* extracted from optmain.tlib near line 1113 */
+/* extracted from optmain.tlib near line 1254 */
/**
* The directory containing the data associated with gnutls-cli-debug.
@@ -393,6 +400,7 @@ emit_ranges:
#ifndef WITH_PACKAGER
# define gnutls_cli_debug_packager_info NULL
#else
+/** Packager information for gnutls-cli-debug. */
static char const gnutls_cli_debug_packager_info[] =
"Packaged by " WITH_PACKAGER
@@ -448,42 +456,69 @@ tOptions gnutls_cli_debugOptions = {
};
#if ENABLE_NLS
+/**
+ * This code is designed to translate translatable option text for the
+ * gnutls-cli-debug program. These translations happen upon entry
+ * to optionProcess().
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
#include <autoopts/usage-txt.h>
-static char* AO_gettext(char const* pz);
-static void coerce_it(void** s);
+static char * AO_gettext(char const * pz);
+static void coerce_it(void ** s);
/**
- * AutoGen specific wrapper function for gettext.
- * It relies on the macro _() to convert from English to the target
- * language, then strdup-duplicates the result string.
+ * AutoGen specific wrapper function for gettext. It relies on the macro _()
+ * to convert from English to the target language, then strdup-duplicates the
+ * result string. It tries the "libopts" domain first, then whatever has been
+ * set via the \a textdomain(3) call.
*
* @param[in] pz the input text used as a lookup key.
* @returns the translated text (if there is one),
* or the original text (if not).
*/
static char *
-AO_gettext(char const* pz)
+AO_gettext(char const * pz)
{
- char* pzRes;
+ char * res;
if (pz == NULL)
return NULL;
- pzRes = _(pz);
- if (pzRes == pz)
- return pzRes;
- pzRes = strdup(pzRes);
- if (pzRes == NULL) {
+#ifdef HAVE_DCGETTEXT
+ /*
+ * While processing the option_xlateable_txt data, try to use the
+ * "libopts" domain. Once we switch to the option descriptor data,
+ * do *not* use that domain.
+ */
+ if (option_xlateable_txt.field_ct != 0) {
+ res = dgettext("libopts", pz);
+ if (res == pz)
+ res = (char *)(void *)_(pz);
+ } else
+ res = (char *)(void *)_(pz);
+#else
+ res = (char *)(void *)_(pz);
+#endif
+ if (res == pz)
+ return res;
+ res = strdup(res);
+ if (res == NULL) {
fputs(_("No memory for duping translated strings\n"), stderr);
exit(GNUTLS_CLI_DEBUG_EXIT_FAILURE);
}
- return pzRes;
+ return res;
}
-static void coerce_it(void** s) { *s = AO_gettext(*s);
+/**
+ * All the pointers we use are marked "* const", but they are stored in
+ * writable memory. Coerce the mutability and set the pointer.
+ */
+static void coerce_it(void ** s) { *s = AO_gettext(*s);
}
/**
@@ -493,56 +528,415 @@ static void coerce_it(void** s) { *s = AO_gettext(*s);
static void
translate_option_strings(void)
{
- tOptions * const pOpt = &gnutls_cli_debugOptions;
+ tOptions * const opts = &gnutls_cli_debugOptions;
/*
* Guard against re-translation. It won't work. The strings will have
* been changed by the first pass through this code. One shot only.
*/
- if (option_usage_text.field_ct != 0) {
+ if (option_xlateable_txt.field_ct != 0) {
/*
* Do the translations. The first pointer follows the field count
* field. The field count field is the size of a pointer.
*/
- tOptDesc * pOD = pOpt->pOptDesc;
- char ** ppz = (char**)(void*)&(option_usage_text);
- int ix = option_usage_text.field_ct;
+ char ** ppz = (char**)(void*)&(option_xlateable_txt);
+ int ix = option_xlateable_txt.field_ct;
do {
- ppz++;
+ ppz++; /* skip over field_ct */
*ppz = AO_gettext(*ppz);
} while (--ix > 0);
-
- coerce_it((void*)&(pOpt->pzCopyright));
- coerce_it((void*)&(pOpt->pzCopyNotice));
- coerce_it((void*)&(pOpt->pzFullVersion));
- coerce_it((void*)&(pOpt->pzUsageTitle));
- coerce_it((void*)&(pOpt->pzExplain));
- coerce_it((void*)&(pOpt->pzDetail));
- coerce_it((void*)&(pOpt->pzPackager));
- coerce_it((void*)&(pOpt->pzShortUsage));
- option_usage_text.field_ct = 0;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++)
- coerce_it((void*)&(pOD->pzText));
- }
-
- if ((pOpt->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
- tOptDesc * pOD = pOpt->pOptDesc;
- int ix;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++) {
- coerce_it((void*)&(pOD->pz_Name));
- coerce_it((void*)&(pOD->pz_DisableName));
- coerce_it((void*)&(pOD->pz_DisablePfx));
+ /* prevent re-translation and disable "libopts" domain lookup */
+ option_xlateable_txt.field_ct = 0;
+
+ coerce_it((void*)&(opts->pzCopyright));
+ coerce_it((void*)&(opts->pzCopyNotice));
+ coerce_it((void*)&(opts->pzFullVersion));
+ 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));
}
- /* prevent re-translation */
- gnutls_cli_debugOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
}
-
#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 gnutls_cli_debugOptions structure noted in the comments below. The
+ literal text is defined in gnutls_cli_debug_opt_strs.
+
+ NOTE: the strings below are segmented with respect to the source string
+ gnutls_cli_debug_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 gnutls_cli_debugOptions.pzCopyright */
+ puts(_("gnutls-cli-debug @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 gnutls_cli_debugOptions.pzCopyNotice */
+ puts(_("gnutls-cli-debug is free software: you can redistribute it and/or modify it\n\
+under 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(_("gnutls-cli-debug is distributed in the hope that it will be useful, but\n\
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n\
+or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\n\
+for more 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 gnutls_cli_debugOptions.pOptDesc->pzText */
+ puts(_("Enable debugging."));
+
+ /* referenced via gnutls_cli_debugOptions.pOptDesc->pzText */
+ puts(_("More verbose output"));
+
+ /* referenced via gnutls_cli_debugOptions.pOptDesc->pzText */
+ puts(_("The port to connect to"));
+
+ /* referenced via gnutls_cli_debugOptions.pOptDesc->pzText */
+ puts(_("display extended usage information and exit"));
+
+ /* referenced via gnutls_cli_debugOptions.pOptDesc->pzText */
+ puts(_("extended usage information passed thru pager"));
+
+ /* referenced via gnutls_cli_debugOptions.pOptDesc->pzText */
+ puts(_("output version information and exit"));
+
+ /* referenced via gnutls_cli_debugOptions.pzUsageTitle */
+ puts(_("gnutls-cli-debug - GnuTLS debug client\n\
+Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \n"));
+
+ /* referenced via gnutls_cli_debugOptions.pzExplain */
+ puts(_("\n"));
+
+ /* referenced via gnutls_cli_debugOptions.pzDetail */
+ puts(_("TLS debug client. It sets up multiple TLS connections to a server and\n\
+queries its capabilities. It was created to assist in debugging GnuTLS,\n\
+but it might be useful to extract a TLS server's capabilities. It connects\n\
+to a TLS server, performs tests and print the server's capabilities. If\n\
+called with the `-v' parameter more checks will be performed. Can be used\n\
+to check for servers with special needs or bugs.\n"));
+
+ /* referenced via gnutls_cli_debugOptions.pzFullVersion */
+ puts(_("gnutls-cli-debug @VERSION@"));
+
+ /* referenced via gnutls_cli_debugOptions.pzFullUsage */
+ puts(_("<<<NOT-FOUND>>>"));
+
+ /* referenced via gnutls_cli_debugOptions.pzShortUsage */
+ puts(_("Usage: gnutls-cli-debug [options] hostname\n\
+gnutls-cli --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/cli-debug-args.h b/src/cli-debug-args.h
index 23362636c8..bbb972e157 100644
--- a/src/cli-debug-args.h
+++ b/src/cli-debug-args.h
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (cli-debug-args.h)
- *
- * It has been AutoGen-ed November 8, 2012 at 11:35:50 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:16 PM by AutoGen 5.17.3
* From the definitions cli-debug-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This header file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,24 +21,23 @@
*
* 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>
*
* gnutls-cli-debug 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.
- *
+ *
* gnutls-cli-debug 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 gnutls-cli-debug program.
* These macros are documented in the AutoGen info file in the
@@ -49,22 +48,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 147460
+#define AO_TEMPLATE_VERSION 155648
#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:
+/**
+ * Enumeration of each option type for gnutls-cli-debug
*/
typedef enum {
INDEX_OPT_DEBUG = 0,
@@ -74,44 +73,63 @@ typedef enum {
INDEX_OPT_HELP = 4,
INDEX_OPT_MORE_HELP = 5
} teOptIndex;
-
+/** count of all options for gnutls-cli-debug */
#define OPTION_CT 6
+/** gnutls-cli-debug version */
#define GNUTLS_CLI_DEBUG_VERSION "@VERSION@"
+/** Full gnutls-cli-debug version text */
#define GNUTLS_CLI_DEBUG_FULL_VERSION "gnutls-cli-debug @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) (gnutls_cli_debugOptions.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 gnutls-cli-debug exit codes
*/
typedef enum {
- GNUTLS_CLI_DEBUG_EXIT_SUCCESS = 0,
- GNUTLS_CLI_DEBUG_EXIT_FAILURE = 1,
+ GNUTLS_CLI_DEBUG_EXIT_SUCCESS = 0,
+ GNUTLS_CLI_DEBUG_EXIT_FAILURE = 1,
+ GNUTLS_CLI_DEBUG_EXIT_USAGE_ERROR = 64,
GNUTLS_CLI_DEBUG_EXIT_LIBOPTS_FAILURE = 70
} gnutls_cli_debug_exit_code_t;
-/* * * * * *
- *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/**
* Interface defines for specific options.
+ * @{
*/
#define VALUE_OPT_DEBUG 'd'
@@ -120,8 +138,11 @@ typedef enum {
#define VALUE_OPT_PORT 'p'
#define OPT_VALUE_PORT (DESC(PORT).optArg.argInt)
+/** 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
@@ -133,7 +154,7 @@ typedef enum {
gnutls_cli_debugOptions.pzCurOpt = NULL)
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*gnutls_cli_debugOptions.pUsageProc)(&gnutls_cli_debugOptions, c)
-/* extracted from opthead.tlib near line 484 */
+/* extracted from opthead.tlib near line 538 */
#ifdef __cplusplus
extern "C" {
@@ -153,6 +174,12 @@ extern tOptions gnutls_cli_debugOptions;
#if defined(ENABLE_NLS)
# ifndef _
# include <stdio.h>
+# ifndef HAVE_GETTEXT
+ extern char * gettext(char const *);
+# else
+# include <libintl.h>
+# endif
+
static inline char* aoGetsText(char const* pz) {
if (pz == NULL) return NULL;
return (char*)gettext(pz);
diff --git a/src/danetool-args.c b/src/danetool-args.c
index 09825fadaa..5e1a7507ce 100644
--- a/src/danetool-args.c
+++ b/src/danetool-args.c
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (danetool-args.c)
- *
- * It has been AutoGen-ed March 7, 2013 at 11:03:28 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:19 PM by AutoGen 5.17.3
* From the definitions danetool-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This source file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,20 +21,19 @@
*
* 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>
*
* danetool 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.
- *
+ *
* danetool 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/>.
*/
@@ -53,28 +52,24 @@
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 (danetool_opt_strs+0)
-#define zLicenseDescrip (danetool_opt_strs+279)
+#define zLicenseDescrip (danetool_opt_strs+275)
#ifndef NULL
# define NULL 0
#endif
-/*
- * danetool option static const strings
+/**
+ * static const strings for danetool options
*/
-static char const danetool_opt_strs[2520] =
+static char const danetool_opt_strs[2503] =
/* 0 */ "danetool @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\n"
- "GNU General Public License, version 3 or later\n"
- " <http://gnu.org/licenses/gpl.html>\n\0"
-/* 279 */ "danetool is free software: you can redistribute it and/or modify it under\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 */ "danetool 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"
@@ -84,304 +79,400 @@ static char const danetool_opt_strs[2520] =
"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"
-/* 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 */ "Loads a public key file\0"
-/* 1027 */ "LOAD_PUBKEY\0"
-/* 1039 */ "load-pubkey\0"
-/* 1051 */ "Loads a certificate file\0"
-/* 1076 */ "LOAD_CERTIFICATE\0"
-/* 1093 */ "load-certificate\0"
-/* 1110 */ "Sets a DLV file\0"
-/* 1126 */ "DLV\0"
-/* 1130 */ "dlv\0"
-/* 1134 */ "Hash algorithm to use for signing.\0"
-/* 1169 */ "HASH\0"
-/* 1174 */ "hash\0"
-/* 1179 */ "Check a host's DANE TLSA entry.\0"
-/* 1211 */ "CHECK\0"
-/* 1217 */ "check\0"
-/* 1223 */ "Check only the end-entity's certificate.\0"
-/* 1264 */ "CHECK_EE\0"
-/* 1273 */ "check-ee\0"
-/* 1282 */ "Check only the CA's certificate.\0"
-/* 1315 */ "CHECK_CA\0"
-/* 1324 */ "check-ca\0"
-/* 1333 */ "Do not verify any DNSSEC signature.\0"
-/* 1369 */ "INSECURE\0"
-/* 1378 */ "insecure\0"
-/* 1387 */ "Use the local DNS server for DNSSEC resolving.\0"
-/* 1434 */ "LOCAL_DNS\0"
-/* 1444 */ "no-local-dns\0"
-/* 1457 */ "no\0"
-/* 1460 */ "Use DER format for input certificates and private keys.\0"
-/* 1516 */ "INDER\0"
-/* 1522 */ "no-inder\0"
-/* 1531 */ "This is an alias for 'inder'\0"
-/* 1560 */ "inraw\0"
-/* 1566 */ "Print the DANE RR data on a certificate or public key\0"
-/* 1620 */ "TLSA_RR\0"
-/* 1628 */ "tlsa-rr\0"
-/* 1636 */ "Specify the hostname to be used in the DANE RR\0"
-/* 1683 */ "HOST\0"
-/* 1688 */ "host\0"
-/* 1693 */ "The protocol set for DANE data (tcp, udp etc.)\0"
-/* 1740 */ "PROTO\0"
-/* 1746 */ "proto\0"
-/* 1752 */ "Specify the port number for the DANE data.\0"
-/* 1795 */ "PORT\0"
-/* 1800 */ "port\0"
-/* 1805 */ "Whether the provided certificate or public key is a Certificate\n"
+/* 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 */ "Loads a public key file\0"
+/* 1023 */ "LOAD_PUBKEY\0"
+/* 1035 */ "load-pubkey\0"
+/* 1047 */ "Loads a certificate file\0"
+/* 1072 */ "LOAD_CERTIFICATE\0"
+/* 1089 */ "load-certificate\0"
+/* 1106 */ "Sets a DLV file\0"
+/* 1122 */ "DLV\0"
+/* 1126 */ "dlv\0"
+/* 1130 */ "Hash algorithm to use for signing.\0"
+/* 1165 */ "HASH\0"
+/* 1170 */ "hash\0"
+/* 1175 */ "Check a host's DANE TLSA entry.\0"
+/* 1207 */ "CHECK\0"
+/* 1213 */ "check\0"
+/* 1219 */ "Check only the end-entity's certificate.\0"
+/* 1260 */ "CHECK_EE\0"
+/* 1269 */ "check-ee\0"
+/* 1278 */ "Check only the CA's certificate.\0"
+/* 1311 */ "CHECK_CA\0"
+/* 1320 */ "check-ca\0"
+/* 1329 */ "Do not verify any DNSSEC signature.\0"
+/* 1365 */ "INSECURE\0"
+/* 1374 */ "insecure\0"
+/* 1383 */ "Use the local DNS server for DNSSEC resolving.\0"
+/* 1430 */ "LOCAL_DNS\0"
+/* 1440 */ "no-local-dns\0"
+/* 1453 */ "no\0"
+/* 1456 */ "Use DER format for input certificates and private keys.\0"
+/* 1512 */ "INDER\0"
+/* 1518 */ "no-inder\0"
+/* 1527 */ "an alias for the 'inder' option\0"
+/* 1559 */ "inraw\0"
+/* 1565 */ "Print the DANE RR data on a certificate or public key\0"
+/* 1619 */ "TLSA_RR\0"
+/* 1627 */ "tlsa-rr\0"
+/* 1635 */ "Specify the hostname to be used in the DANE RR\0"
+/* 1682 */ "HOST\0"
+/* 1687 */ "host\0"
+/* 1692 */ "The protocol set for DANE data (tcp, udp etc.)\0"
+/* 1739 */ "PROTO\0"
+/* 1745 */ "proto\0"
+/* 1751 */ "Specify the port number for the DANE data.\0"
+/* 1794 */ "PORT\0"
+/* 1799 */ "port\0"
+/* 1804 */ "Whether the provided certificate or public key is a Certificate\n"
"Authority.\0"
-/* 1880 */ "CA\0"
-/* 1883 */ "ca\0"
-/* 1886 */ "Use the hash of the X.509 certificate, rather than the public key.\0"
-/* 1953 */ "X509\0"
-/* 1958 */ "x509\0"
-/* 1963 */ "This is an alias for 'domain'\0"
-/* 1993 */ "local\0"
-/* 1999 */ "The provided certificate or public key is issued by the local domain.\0"
-/* 2069 */ "DOMAIN\0"
-/* 2076 */ "no-domain\0"
-/* 2086 */ "Display extended usage information and exit\0"
-/* 2130 */ "help\0"
-/* 2135 */ "Extended usage information passed thru pager\0"
-/* 2180 */ "more-help\0"
-/* 2190 */ "Output version information and exit\0"
-/* 2226 */ "version\0"
-/* 2234 */ "DANETOOL\0"
-/* 2243 */ "danetool - GnuTLS DANE tool - Ver. @VERSION@\n"
- "USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
-/* 2346 */ "bug-gnutls@gnu.org\0"
-/* 2365 */ "\n\n\0"
-/* 2368 */ "\n"
- "Tool to generate and check DNS resource records for the DANE protocol.\n\0"
-/* 2441 */ "danetool @VERSION@\0"
-/* 2460 */ "danetool [options]\n"
+/* 1879 */ "CA\0"
+/* 1882 */ "ca\0"
+/* 1885 */ "Use the hash of the X.509 certificate, rather than the public key.\0"
+/* 1952 */ "X509\0"
+/* 1957 */ "x509\0"
+/* 1962 */ "an alias for the 'domain' option\0"
+/* 1995 */ "local\0"
+/* 2001 */ "The provided certificate or public key is issued by the local domain.\0"
+/* 2071 */ "DOMAIN\0"
+/* 2078 */ "no-domain\0"
+/* 2088 */ "display extended usage information and exit\0"
+/* 2132 */ "help\0"
+/* 2137 */ "extended usage information passed thru pager\0"
+/* 2182 */ "more-help\0"
+/* 2192 */ "output version information and exit\0"
+/* 2228 */ "version\0"
+/* 2236 */ "DANETOOL\0"
+/* 2245 */ "danetool - GnuTLS DANE tool\n"
+ "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
+/* 2331 */ "bug-gnutls@gnu.org\0"
+/* 2350 */ "\n\0"
+/* 2352 */ "Tool to generate and check DNS resource records for the DANE protocol.\n\0"
+/* 2424 */ "danetool @VERSION@\0"
+/* 2443 */ "danetool [options]\n"
"danetool --help for usage instructions.\n";
-/*
+/**
* debug option description:
*/
-#define DEBUG_DESC (danetool_opt_strs+884)
-#define DEBUG_NAME (danetool_opt_strs+902)
-#define DEBUG_name (danetool_opt_strs+908)
+/** Descriptive text for the debug option */
+#define DEBUG_DESC (danetool_opt_strs+880)
+/** Upper-cased name for the debug option */
+#define DEBUG_NAME (danetool_opt_strs+898)
+/** Name string for the debug option */
+#define DEBUG_name (danetool_opt_strs+904)
+/** Compiled in flag settings for the debug option */
#define DEBUG_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* verbose option description:
*/
-#define VERBOSE_DESC (danetool_opt_strs+914)
-#define VERBOSE_NAME (danetool_opt_strs+934)
-#define VERBOSE_name (danetool_opt_strs+942)
+/** Descriptive text for the verbose option */
+#define VERBOSE_DESC (danetool_opt_strs+910)
+/** Upper-cased name for the verbose option */
+#define VERBOSE_NAME (danetool_opt_strs+930)
+/** Name string for the verbose option */
+#define VERBOSE_name (danetool_opt_strs+938)
+/** Compiled in flag settings for the verbose option */
#define VERBOSE_FLAGS (OPTST_DISABLED)
-/*
+/**
* infile option description:
*/
-#define INFILE_DESC (danetool_opt_strs+950)
-#define INFILE_NAME (danetool_opt_strs+961)
-#define INFILE_name (danetool_opt_strs+968)
+/** Descriptive text for the infile option */
+#define INFILE_DESC (danetool_opt_strs+946)
+/** Upper-cased name for the infile option */
+#define INFILE_NAME (danetool_opt_strs+957)
+/** Name string for the infile option */
+#define INFILE_name (danetool_opt_strs+964)
+/** Compiled in flag settings for the infile option */
#define INFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* outfile option description:
*/
-#define OUTFILE_DESC (danetool_opt_strs+975)
-#define OUTFILE_NAME (danetool_opt_strs+987)
-#define OUTFILE_name (danetool_opt_strs+995)
+/** Descriptive text for the outfile option */
+#define OUTFILE_DESC (danetool_opt_strs+971)
+/** Upper-cased name for the outfile option */
+#define OUTFILE_NAME (danetool_opt_strs+983)
+/** Name string for the outfile option */
+#define OUTFILE_name (danetool_opt_strs+991)
+/** Compiled in flag settings for the outfile option */
#define OUTFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* load-pubkey option description:
*/
-#define LOAD_PUBKEY_DESC (danetool_opt_strs+1003)
-#define LOAD_PUBKEY_NAME (danetool_opt_strs+1027)
-#define LOAD_PUBKEY_name (danetool_opt_strs+1039)
+/** Descriptive text for the load-pubkey option */
+#define LOAD_PUBKEY_DESC (danetool_opt_strs+999)
+/** Upper-cased name for the load-pubkey option */
+#define LOAD_PUBKEY_NAME (danetool_opt_strs+1023)
+/** Name string for the load-pubkey option */
+#define LOAD_PUBKEY_name (danetool_opt_strs+1035)
+/** Compiled in flag settings for the load-pubkey option */
#define LOAD_PUBKEY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* load-certificate option description:
*/
-#define LOAD_CERTIFICATE_DESC (danetool_opt_strs+1051)
-#define LOAD_CERTIFICATE_NAME (danetool_opt_strs+1076)
-#define LOAD_CERTIFICATE_name (danetool_opt_strs+1093)
+/** Descriptive text for the load-certificate option */
+#define LOAD_CERTIFICATE_DESC (danetool_opt_strs+1047)
+/** Upper-cased name for the load-certificate option */
+#define LOAD_CERTIFICATE_NAME (danetool_opt_strs+1072)
+/** Name string for the load-certificate option */
+#define LOAD_CERTIFICATE_name (danetool_opt_strs+1089)
+/** Compiled in flag settings for the load-certificate option */
#define LOAD_CERTIFICATE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* dlv option description:
*/
-#define DLV_DESC (danetool_opt_strs+1110)
-#define DLV_NAME (danetool_opt_strs+1126)
-#define DLV_name (danetool_opt_strs+1130)
+/** Descriptive text for the dlv option */
+#define DLV_DESC (danetool_opt_strs+1106)
+/** Upper-cased name for the dlv option */
+#define DLV_NAME (danetool_opt_strs+1122)
+/** Name string for the dlv option */
+#define DLV_name (danetool_opt_strs+1126)
+/** Compiled in flag settings for the dlv option */
#define DLV_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* hash option description:
*/
-#define HASH_DESC (danetool_opt_strs+1134)
-#define HASH_NAME (danetool_opt_strs+1169)
-#define HASH_name (danetool_opt_strs+1174)
+/** Descriptive text for the hash option */
+#define HASH_DESC (danetool_opt_strs+1130)
+/** Upper-cased name for the hash option */
+#define HASH_NAME (danetool_opt_strs+1165)
+/** Name string for the hash option */
+#define HASH_name (danetool_opt_strs+1170)
+/** Compiled in flag settings for the hash option */
#define HASH_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* check option description:
*/
-#define CHECK_DESC (danetool_opt_strs+1179)
-#define CHECK_NAME (danetool_opt_strs+1211)
-#define CHECK_name (danetool_opt_strs+1217)
+/** Descriptive text for the check option */
+#define CHECK_DESC (danetool_opt_strs+1175)
+/** Upper-cased name for the check option */
+#define CHECK_NAME (danetool_opt_strs+1207)
+/** Name string for the check option */
+#define CHECK_name (danetool_opt_strs+1213)
+/** Compiled in flag settings for the check option */
#define CHECK_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* check-ee option description:
*/
-#define CHECK_EE_DESC (danetool_opt_strs+1223)
-#define CHECK_EE_NAME (danetool_opt_strs+1264)
-#define CHECK_EE_name (danetool_opt_strs+1273)
+/** Descriptive text for the check-ee option */
+#define CHECK_EE_DESC (danetool_opt_strs+1219)
+/** Upper-cased name for the check-ee option */
+#define CHECK_EE_NAME (danetool_opt_strs+1260)
+/** Name string for the check-ee option */
+#define CHECK_EE_name (danetool_opt_strs+1269)
+/** Compiled in flag settings for the check-ee option */
#define CHECK_EE_FLAGS (OPTST_DISABLED)
-/*
+/**
* check-ca option description:
*/
-#define CHECK_CA_DESC (danetool_opt_strs+1282)
-#define CHECK_CA_NAME (danetool_opt_strs+1315)
-#define CHECK_CA_name (danetool_opt_strs+1324)
+/** Descriptive text for the check-ca option */
+#define CHECK_CA_DESC (danetool_opt_strs+1278)
+/** Upper-cased name for the check-ca option */
+#define CHECK_CA_NAME (danetool_opt_strs+1311)
+/** Name string for the check-ca option */
+#define CHECK_CA_name (danetool_opt_strs+1320)
+/** Compiled in flag settings for the check-ca option */
#define CHECK_CA_FLAGS (OPTST_DISABLED)
-/*
+/**
* insecure option description:
*/
-#define INSECURE_DESC (danetool_opt_strs+1333)
-#define INSECURE_NAME (danetool_opt_strs+1369)
-#define INSECURE_name (danetool_opt_strs+1378)
+/** Descriptive text for the insecure option */
+#define INSECURE_DESC (danetool_opt_strs+1329)
+/** Upper-cased name for the insecure option */
+#define INSECURE_NAME (danetool_opt_strs+1365)
+/** Name string for the insecure option */
+#define INSECURE_name (danetool_opt_strs+1374)
+/** Compiled in flag settings for the insecure option */
#define INSECURE_FLAGS (OPTST_DISABLED)
-/*
+/**
* local-dns option description:
*/
-#define LOCAL_DNS_DESC (danetool_opt_strs+1387)
-#define LOCAL_DNS_NAME (danetool_opt_strs+1434)
-#define NOT_LOCAL_DNS_name (danetool_opt_strs+1444)
-#define NOT_LOCAL_DNS_PFX (danetool_opt_strs+1457)
+/** Descriptive text for the local-dns option */
+#define LOCAL_DNS_DESC (danetool_opt_strs+1383)
+/** Upper-cased name for the local-dns option */
+#define LOCAL_DNS_NAME (danetool_opt_strs+1430)
+/** disablement name for the local-dns option */
+#define NOT_LOCAL_DNS_name (danetool_opt_strs+1440)
+/** disablement prefix for the local-dns option */
+#define NOT_LOCAL_DNS_PFX (danetool_opt_strs+1453)
+/** Name string for the local-dns option */
#define LOCAL_DNS_name (NOT_LOCAL_DNS_name + 3)
+/** Compiled in flag settings for the local-dns option */
#define LOCAL_DNS_FLAGS (OPTST_DISABLED)
-/*
+/**
* inder option description:
*/
-#define INDER_DESC (danetool_opt_strs+1460)
-#define INDER_NAME (danetool_opt_strs+1516)
-#define NOT_INDER_name (danetool_opt_strs+1522)
-#define NOT_INDER_PFX (danetool_opt_strs+1457)
+/** Descriptive text for the inder option */
+#define INDER_DESC (danetool_opt_strs+1456)
+/** Upper-cased name for the inder option */
+#define INDER_NAME (danetool_opt_strs+1512)
+/** disablement name for the inder option */
+#define NOT_INDER_name (danetool_opt_strs+1518)
+/** disablement prefix for the inder option */
+#define NOT_INDER_PFX (danetool_opt_strs+1453)
+/** Name string for the inder option */
#define INDER_name (NOT_INDER_name + 3)
+/** Compiled in flag settings for the inder option */
#define INDER_FLAGS (OPTST_DISABLED)
-/*
+/**
* inraw option description:
*/
-#define INRAW_DESC (danetool_opt_strs+1531)
+/** Descriptive text for the inraw option */
+#define INRAW_DESC (danetool_opt_strs+1527)
#define INRAW_NAME NULL
-#define INRAW_name (danetool_opt_strs+1560)
+/** Unmodified name string for the inraw option */
+#define INRAW_name (danetool_opt_strs+1559)
+/** Compiled in flag settings for the inraw option */
#define INRAW_FLAGS (INDER_FLAGS | OPTST_ALIAS)
-/*
+/**
* tlsa-rr option description with
* "Must also have options" and "Incompatible options":
*/
-#define TLSA_RR_DESC (danetool_opt_strs+1566)
-#define TLSA_RR_NAME (danetool_opt_strs+1620)
-#define TLSA_RR_name (danetool_opt_strs+1628)
+/** Descriptive text for the tlsa-rr option */
+#define TLSA_RR_DESC (danetool_opt_strs+1565)
+/** Upper-cased name for the tlsa-rr option */
+#define TLSA_RR_NAME (danetool_opt_strs+1619)
+/** Name string for the tlsa-rr option */
+#define TLSA_RR_name (danetool_opt_strs+1627)
+/** Other options that are required by the tlsa-rr option */
static int const aTlsa_RrMustList[] = {
INDEX_OPT_HOST, NO_EQUIVALENT };
+/** Compiled in flag settings for the tlsa-rr option */
#define TLSA_RR_FLAGS (OPTST_DISABLED)
-/*
+/**
* host option description:
*/
-#define HOST_DESC (danetool_opt_strs+1636)
-#define HOST_NAME (danetool_opt_strs+1683)
-#define HOST_name (danetool_opt_strs+1688)
+/** Descriptive text for the host option */
+#define HOST_DESC (danetool_opt_strs+1635)
+/** Upper-cased name for the host option */
+#define HOST_NAME (danetool_opt_strs+1682)
+/** Name string for the host option */
+#define HOST_name (danetool_opt_strs+1687)
+/** Compiled in flag settings for the host option */
#define HOST_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* proto option description:
*/
-#define PROTO_DESC (danetool_opt_strs+1693)
-#define PROTO_NAME (danetool_opt_strs+1740)
-#define PROTO_name (danetool_opt_strs+1746)
+/** Descriptive text for the proto option */
+#define PROTO_DESC (danetool_opt_strs+1692)
+/** Upper-cased name for the proto option */
+#define PROTO_NAME (danetool_opt_strs+1739)
+/** Name string for the proto option */
+#define PROTO_name (danetool_opt_strs+1745)
+/** Compiled in flag settings for the proto option */
#define PROTO_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* port option description:
*/
-#define PORT_DESC (danetool_opt_strs+1752)
-#define PORT_NAME (danetool_opt_strs+1795)
-#define PORT_name (danetool_opt_strs+1800)
+/** Descriptive text for the port option */
+#define PORT_DESC (danetool_opt_strs+1751)
+/** Upper-cased name for the port option */
+#define PORT_NAME (danetool_opt_strs+1794)
+/** Name string for the port option */
+#define PORT_name (danetool_opt_strs+1799)
+/** Compiled in flag settings for the port option */
#define PORT_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* ca option description:
*/
-#define CA_DESC (danetool_opt_strs+1805)
-#define CA_NAME (danetool_opt_strs+1880)
-#define CA_name (danetool_opt_strs+1883)
+/** Descriptive text for the ca option */
+#define CA_DESC (danetool_opt_strs+1804)
+/** Upper-cased name for the ca option */
+#define CA_NAME (danetool_opt_strs+1879)
+/** Name string for the ca option */
+#define CA_name (danetool_opt_strs+1882)
+/** Compiled in flag settings for the ca option */
#define CA_FLAGS (OPTST_DISABLED)
-/*
+/**
* x509 option description:
*/
-#define X509_DESC (danetool_opt_strs+1886)
-#define X509_NAME (danetool_opt_strs+1953)
-#define X509_name (danetool_opt_strs+1958)
+/** Descriptive text for the x509 option */
+#define X509_DESC (danetool_opt_strs+1885)
+/** Upper-cased name for the x509 option */
+#define X509_NAME (danetool_opt_strs+1952)
+/** Name string for the x509 option */
+#define X509_name (danetool_opt_strs+1957)
+/** Compiled in flag settings for the x509 option */
#define X509_FLAGS (OPTST_DISABLED)
-/*
+/**
* local option description:
*/
-#define LOCAL_DESC (danetool_opt_strs+1963)
+/** Descriptive text for the local option */
+#define LOCAL_DESC (danetool_opt_strs+1962)
#define LOCAL_NAME NULL
-#define LOCAL_name (danetool_opt_strs+1993)
+/** Unmodified name string for the local option */
+#define LOCAL_name (danetool_opt_strs+1995)
+/** Compiled in flag settings for the local option */
#define LOCAL_FLAGS (DOMAIN_FLAGS | OPTST_ALIAS)
-/*
+/**
* domain option description:
*/
-#define DOMAIN_DESC (danetool_opt_strs+1999)
-#define DOMAIN_NAME (danetool_opt_strs+2069)
-#define NOT_DOMAIN_name (danetool_opt_strs+2076)
-#define NOT_DOMAIN_PFX (danetool_opt_strs+1457)
+/** Descriptive text for the domain option */
+#define DOMAIN_DESC (danetool_opt_strs+2001)
+/** Upper-cased name for the domain option */
+#define DOMAIN_NAME (danetool_opt_strs+2071)
+/** disablement name for the domain option */
+#define NOT_DOMAIN_name (danetool_opt_strs+2078)
+/** disablement prefix for the domain option */
+#define NOT_DOMAIN_PFX (danetool_opt_strs+1453)
+/** Name string for the domain option */
#define DOMAIN_name (NOT_DOMAIN_name + 3)
+/** Compiled in flag settings for the domain option */
#define DOMAIN_FLAGS (OPTST_INITENABLED)
/*
* Help/More_Help/Version option descriptions:
*/
-#define HELP_DESC (danetool_opt_strs+2086)
-#define HELP_name (danetool_opt_strs+2130)
+#define HELP_DESC (danetool_opt_strs+2088)
+#define HELP_name (danetool_opt_strs+2132)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (danetool_opt_strs+2135)
-#define MORE_HELP_name (danetool_opt_strs+2180)
+#define MORE_HELP_DESC (danetool_opt_strs+2137)
+#define MORE_HELP_name (danetool_opt_strs+2182)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC NULL
@@ -394,9 +485,9 @@ static int const aTlsa_RrMustList[] = {
# define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
#endif
-#define VER_DESC (danetool_opt_strs+2190)
-#define VER_name (danetool_opt_strs+2226)
-/*
+#define VER_DESC (danetool_opt_strs+2192)
+#define VER_name (danetool_opt_strs+2228)
+/**
* Declare option callback procedures
*/
extern tOptProc
@@ -695,7 +786,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, 0,
+ /* opt state flags */ VER_FLAGS, AOUSE_VERSION,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -709,7 +800,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, 0,
+ /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -721,7 +812,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, 0,
+ /* opt state flags */ MORE_HELP_FLAGS, AOUSE_MORE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -731,19 +822,24 @@ static tOptDesc optDesc[OPTION_CT] = {
};
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Define the danetool Option Environment
- */
-#define zPROGNAME (danetool_opt_strs+2234)
-#define zUsageTitle (danetool_opt_strs+2243)
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/** Reference to the upper cased version of danetool. */
+#define zPROGNAME (danetool_opt_strs+2236)
+/** Reference to the title line for danetool usage. */
+#define zUsageTitle (danetool_opt_strs+2245)
+/** There is no danetool configuration file. */
#define zRcName NULL
+/** There are no directories to search for danetool config files. */
#define apzHomeList NULL
-#define zBugsAddr (danetool_opt_strs+2346)
-#define zExplain (danetool_opt_strs+2365)
-#define zDetail (danetool_opt_strs+2368)
-#define zFullVersion (danetool_opt_strs+2441)
-/* extracted from optcode.tlib near line 350 */
+/** The danetool program bug email address. */
+#define zBugsAddr (danetool_opt_strs+2331)
+/** Clarification/explanation of what danetool does. */
+#define zExplain (danetool_opt_strs+2350)
+/** Extra detail explaining what danetool does. */
+#define zDetail (danetool_opt_strs+2352)
+/** The full version string for danetool. */
+#define zFullVersion (danetool_opt_strs+2424)
+/* extracted from optcode.tlib near line 371 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT
@@ -753,10 +849,8 @@ static tOptDesc optDesc[OPTION_CT] = {
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
-
#define danetool_full_usage (NULL)
-
-#define danetool_short_usage (danetool_opt_strs+2460)
+#define danetool_short_usage (danetool_opt_strs+2443)
#endif /* not defined __doxygen__ */
@@ -766,8 +860,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/**
* The callout function that invokes the optionUsage function.
*
- * @param pOptions the AutoOpts option description structure
- * @param pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] pOptions the AutoOpts option description structure
+ * @param[in] pOptDesc the descriptor for the "help" (usage) option.
* @noreturn
*/
static void
@@ -782,9 +876,9 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Code to handle the debug option.
- *
- * @param pOptions the danetool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * Specifies the debug level.
+ * @param[in] pOptions the danetool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -810,8 +904,7 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
@@ -819,8 +912,8 @@ emit_ranges:
/**
* Code to handle the infile option.
*
- * @param pOptions the danetool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the danetool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptInfile(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -833,6 +926,9 @@ doOptInfile(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -840,15 +936,15 @@ doOptInfile(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the inraw option.
*
- * @param pOptions the danetool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the danetool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptInraw(tOptions* pOptions, tOptDesc* pOptDesc)
{
int res = optionAlias(pOptions, pOptDesc, INDEX_OPT_INDER);
if ((res != 0) && ((pOptions->fOptSet & OPTPROC_ERRSTOP) != 0))
- USAGE(DANETOOL_EXIT_FAILURE);
+ USAGE(DANETOOL_EXIT_USAGE_ERROR);
}
@@ -856,18 +952,18 @@ doOptInraw(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the local option.
*
- * @param pOptions the danetool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the danetool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptLocal(tOptions* pOptions, tOptDesc* pOptDesc)
{
int res = optionAlias(pOptions, pOptDesc, INDEX_OPT_DOMAIN);
if ((res != 0) && ((pOptions->fOptSet & OPTPROC_ERRSTOP) != 0))
- USAGE(DANETOOL_EXIT_FAILURE);
+ USAGE(DANETOOL_EXIT_USAGE_ERROR);
}
-/* extracted from optmain.tlib near line 1113 */
+/* extracted from optmain.tlib near line 1254 */
/**
* The directory containing the data associated with danetool.
@@ -883,6 +979,7 @@ doOptLocal(tOptions* pOptions, tOptDesc* pOptDesc)
#ifndef WITH_PACKAGER
# define danetool_packager_info NULL
#else
+/** Packager information for danetool. */
static char const danetool_packager_info[] =
"Packaged by " WITH_PACKAGER
@@ -938,42 +1035,69 @@ tOptions danetoolOptions = {
};
#if ENABLE_NLS
+/**
+ * This code is designed to translate translatable option text for the
+ * danetool program. These translations happen upon entry
+ * to optionProcess().
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
#include <autoopts/usage-txt.h>
-static char* AO_gettext(char const* pz);
-static void coerce_it(void** s);
+static char * AO_gettext(char const * pz);
+static void coerce_it(void ** s);
/**
- * AutoGen specific wrapper function for gettext.
- * It relies on the macro _() to convert from English to the target
- * language, then strdup-duplicates the result string.
+ * AutoGen specific wrapper function for gettext. It relies on the macro _()
+ * to convert from English to the target language, then strdup-duplicates the
+ * result string. It tries the "libopts" domain first, then whatever has been
+ * set via the \a textdomain(3) call.
*
* @param[in] pz the input text used as a lookup key.
* @returns the translated text (if there is one),
* or the original text (if not).
*/
static char *
-AO_gettext(char const* pz)
+AO_gettext(char const * pz)
{
- char* pzRes;
+ char * res;
if (pz == NULL)
return NULL;
- pzRes = _(pz);
- if (pzRes == pz)
- return pzRes;
- pzRes = strdup(pzRes);
- if (pzRes == NULL) {
+#ifdef HAVE_DCGETTEXT
+ /*
+ * While processing the option_xlateable_txt data, try to use the
+ * "libopts" domain. Once we switch to the option descriptor data,
+ * do *not* use that domain.
+ */
+ if (option_xlateable_txt.field_ct != 0) {
+ res = dgettext("libopts", pz);
+ if (res == pz)
+ res = (char *)(void *)_(pz);
+ } else
+ res = (char *)(void *)_(pz);
+#else
+ res = (char *)(void *)_(pz);
+#endif
+ if (res == pz)
+ return res;
+ res = strdup(res);
+ if (res == NULL) {
fputs(_("No memory for duping translated strings\n"), stderr);
exit(DANETOOL_EXIT_FAILURE);
}
- return pzRes;
+ return res;
}
-static void coerce_it(void** s) { *s = AO_gettext(*s);
+/**
+ * All the pointers we use are marked "* const", but they are stored in
+ * writable memory. Coerce the mutability and set the pointer.
+ */
+static void coerce_it(void ** s) { *s = AO_gettext(*s);
}
/**
@@ -983,56 +1107,471 @@ static void coerce_it(void** s) { *s = AO_gettext(*s);
static void
translate_option_strings(void)
{
- tOptions * const pOpt = &danetoolOptions;
+ tOptions * const opts = &danetoolOptions;
/*
* Guard against re-translation. It won't work. The strings will have
* been changed by the first pass through this code. One shot only.
*/
- if (option_usage_text.field_ct != 0) {
+ if (option_xlateable_txt.field_ct != 0) {
/*
* Do the translations. The first pointer follows the field count
* field. The field count field is the size of a pointer.
*/
- tOptDesc * pOD = pOpt->pOptDesc;
- char ** ppz = (char**)(void*)&(option_usage_text);
- int ix = option_usage_text.field_ct;
+ char ** ppz = (char**)(void*)&(option_xlateable_txt);
+ int ix = option_xlateable_txt.field_ct;
do {
- ppz++;
+ ppz++; /* skip over field_ct */
*ppz = AO_gettext(*ppz);
} while (--ix > 0);
-
- coerce_it((void*)&(pOpt->pzCopyright));
- coerce_it((void*)&(pOpt->pzCopyNotice));
- coerce_it((void*)&(pOpt->pzFullVersion));
- coerce_it((void*)&(pOpt->pzUsageTitle));
- coerce_it((void*)&(pOpt->pzExplain));
- coerce_it((void*)&(pOpt->pzDetail));
- coerce_it((void*)&(pOpt->pzPackager));
- coerce_it((void*)&(pOpt->pzShortUsage));
- option_usage_text.field_ct = 0;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++)
- coerce_it((void*)&(pOD->pzText));
- }
-
- if ((pOpt->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
- tOptDesc * pOD = pOpt->pOptDesc;
- int ix;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++) {
- coerce_it((void*)&(pOD->pz_Name));
- coerce_it((void*)&(pOD->pz_DisableName));
- coerce_it((void*)&(pOD->pz_DisablePfx));
+ /* prevent re-translation and disable "libopts" domain lookup */
+ option_xlateable_txt.field_ct = 0;
+
+ coerce_it((void*)&(opts->pzCopyright));
+ coerce_it((void*)&(opts->pzCopyNotice));
+ coerce_it((void*)&(opts->pzFullVersion));
+ 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));
}
- /* prevent re-translation */
- danetoolOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
}
-
#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 danetoolOptions structure noted in the comments below. The
+ literal text is defined in danetool_opt_strs.
+
+ NOTE: the strings below are segmented with respect to the source string
+ danetool_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 danetoolOptions.pzCopyright */
+ puts(_("danetool @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 danetoolOptions.pzCopyNotice */
+ puts(_("danetool 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(_("danetool 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 danetoolOptions.pOptDesc->pzText */
+ puts(_("Enable debugging."));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("More verbose output"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Input file"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Output file"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Loads a public key file"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Loads a certificate file"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Sets a DLV file"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Hash algorithm to use for signing."));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Check a host's DANE TLSA entry."));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Check only the end-entity's certificate."));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Check only the CA's certificate."));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Do not verify any DNSSEC signature."));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Use the local DNS server for DNSSEC resolving."));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Use DER format for input certificates and private keys."));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("an alias for the 'inder' option"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Print the DANE RR data on a certificate or public key"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Specify the hostname to be used in the DANE RR"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("The protocol set for DANE data (tcp, udp etc.)"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Specify the port number for the DANE data."));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Whether the provided certificate or public key is a Certificate\n\
+Authority."));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("Use the hash of the X.509 certificate, rather than the public key."));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("an alias for the 'domain' option"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("The provided certificate or public key is issued by the local domain."));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("display extended usage information and exit"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("extended usage information passed thru pager"));
+
+ /* referenced via danetoolOptions.pOptDesc->pzText */
+ puts(_("output version information and exit"));
+
+ /* referenced via danetoolOptions.pzUsageTitle */
+ puts(_("danetool - GnuTLS DANE tool\n\
+Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
+
+ /* referenced via danetoolOptions.pzExplain */
+ puts(_("\n"));
+
+ /* referenced via danetoolOptions.pzDetail */
+ puts(_("Tool to generate and check DNS resource records for the DANE protocol.\n"));
+
+ /* referenced via danetoolOptions.pzFullVersion */
+ puts(_("danetool @VERSION@"));
+
+ /* referenced via danetoolOptions.pzFullUsage */
+ puts(_("<<<NOT-FOUND>>>"));
+
+ /* referenced via danetoolOptions.pzShortUsage */
+ puts(_("danetool [options]\n\
+danetool --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/danetool-args.h b/src/danetool-args.h
index 467d418e5b..81ef445f50 100644
--- a/src/danetool-args.h
+++ b/src/danetool-args.h
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (danetool-args.h)
- *
- * It has been AutoGen-ed March 7, 2013 at 11:03:28 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:19 PM by AutoGen 5.17.3
* From the definitions danetool-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This header file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,24 +21,23 @@
*
* 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>
*
* danetool 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.
- *
+ *
* danetool 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 danetool program.
* These macros are documented in the AutoGen info file in the
@@ -49,22 +48,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 147460
+#define AO_TEMPLATE_VERSION 155648
#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:
+/**
+ * Enumeration of each option type for danetool
*/
typedef enum {
INDEX_OPT_DEBUG = 0,
@@ -94,44 +93,63 @@ typedef enum {
INDEX_OPT_HELP = 24,
INDEX_OPT_MORE_HELP = 25
} teOptIndex;
-
+/** count of all options for danetool */
#define OPTION_CT 26
+/** danetool version */
#define DANETOOL_VERSION "@VERSION@"
+/** Full danetool version text */
#define DANETOOL_FULL_VERSION "danetool @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) (danetoolOptions.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 danetool exit codes
*/
typedef enum {
- DANETOOL_EXIT_SUCCESS = 0,
- DANETOOL_EXIT_FAILURE = 1,
- DANETOOL_EXIT_LIBOPTS_FAILURE = 70
+ DANETOOL_EXIT_SUCCESS = 0,
+ DANETOOL_EXIT_FAILURE = 1,
+ DANETOOL_EXIT_USAGE_ERROR = 64,
+ DANETOOL_EXIT_LIBOPTS_FAILURE = 70
} danetool_exit_code_t;
-/* * * * * *
- *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/**
* Interface defines for specific options.
+ * @{
*/
#define VALUE_OPT_DEBUG 'd'
@@ -160,8 +178,11 @@ typedef enum {
#define VALUE_OPT_X509 20
#define VALUE_OPT_LOCAL 21
#define VALUE_OPT_DOMAIN 22
+/** 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
@@ -173,7 +194,7 @@ typedef enum {
danetoolOptions.pzCurOpt = NULL)
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*danetoolOptions.pUsageProc)(&danetoolOptions, c)
-/* extracted from opthead.tlib near line 484 */
+/* extracted from opthead.tlib near line 538 */
#ifdef __cplusplus
extern "C" {
@@ -193,6 +214,12 @@ extern tOptions danetoolOptions;
#if defined(ENABLE_NLS)
# ifndef _
# include <stdio.h>
+# ifndef HAVE_GETTEXT
+ extern char * gettext(char const *);
+# else
+# include <libintl.h>
+# endif
+
static inline char* aoGetsText(char const* pz) {
if (pz == NULL) return NULL;
return (char*)gettext(pz);
diff --git a/src/ocsptool-args.c b/src/ocsptool-args.c
index 68521c3e54..224f018413 100644
--- a/src/ocsptool-args.c
+++ b/src/ocsptool-args.c
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (ocsptool-args.c)
- *
- * It has been AutoGen-ed November 8, 2012 at 11:35:48 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:16 PM by AutoGen 5.17.3
* From the definitions ocsptool-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This source file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,20 +21,19 @@
*
* 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>
*
* ocsptool 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.
- *
+ *
* ocsptool 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/>.
*/
@@ -53,28 +52,24 @@
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 (ocsptool_opt_strs+0)
-#define zLicenseDescrip (ocsptool_opt_strs+279)
+#define zLicenseDescrip (ocsptool_opt_strs+275)
#ifndef NULL
# define NULL 0
#endif
-/*
- * ocsptool option static const strings
+/**
+ * static const strings for ocsptool options
*/
-static char const ocsptool_opt_strs[2273] =
+static char const ocsptool_opt_strs[2250] =
/* 0 */ "ocsptool @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\n"
- "GNU General Public License, version 3 or later\n"
- " <http://gnu.org/licenses/gpl.html>\n\0"
-/* 279 */ "ocsptool is free software: you can redistribute it and/or modify it under\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 */ "ocsptool 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"
@@ -84,244 +79,318 @@ static char const ocsptool_opt_strs[2273] =
"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"
-/* 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 */ "Ask an OCSP/HTTP server on a certificate validity\0"
-/* 1053 */ "ASK\0"
-/* 1057 */ "ask\0"
-/* 1061 */ "Verify response\0"
-/* 1077 */ "VERIFY_RESPONSE\0"
-/* 1093 */ "verify-response\0"
-/* 1109 */ "Print information on a OCSP request\0"
-/* 1145 */ "REQUEST_INFO\0"
-/* 1158 */ "request-info\0"
-/* 1171 */ "Print information on a OCSP response\0"
-/* 1208 */ "RESPONSE_INFO\0"
-/* 1222 */ "response-info\0"
-/* 1236 */ "Generate an OCSP request\0"
-/* 1261 */ "GENERATE_REQUEST\0"
-/* 1278 */ "generate-request\0"
-/* 1295 */ "Don't add nonce to OCSP request\0"
-/* 1327 */ "NONCE\0"
-/* 1333 */ "no-nonce\0"
-/* 1342 */ "no\0"
-/* 1345 */ "Read issuer certificate from file\0"
-/* 1379 */ "LOAD_ISSUER\0"
-/* 1391 */ "load-issuer\0"
-/* 1403 */ "Read certificate to check from file\0"
-/* 1439 */ "LOAD_CERT\0"
-/* 1449 */ "load-cert\0"
-/* 1459 */ "Read OCSP trust anchors from file\0"
-/* 1493 */ "LOAD_TRUST\0"
-/* 1504 */ "load-trust\0"
-/* 1515 */ "Read OCSP response signer from file\0"
-/* 1551 */ "LOAD_SIGNER\0"
-/* 1563 */ "load-signer\0"
-/* 1575 */ "Use DER format for input certificates and private keys\0"
-/* 1630 */ "INDER\0"
-/* 1636 */ "no-inder\0"
-/* 1645 */ "Read DER encoded OCSP request from file\0"
-/* 1685 */ "LOAD_REQUEST\0"
-/* 1698 */ "load-request\0"
-/* 1711 */ "Read DER encoded OCSP response from file\0"
-/* 1752 */ "LOAD_RESPONSE\0"
-/* 1766 */ "load-response\0"
-/* 1780 */ "Display extended usage information and exit\0"
-/* 1824 */ "help\0"
-/* 1829 */ "Extended usage information passed thru pager\0"
-/* 1874 */ "more-help\0"
-/* 1884 */ "Output version information and exit\0"
-/* 1920 */ "version\0"
-/* 1928 */ "OCSPTOOL\0"
-/* 1937 */ "ocsptool - GnuTLS OCSP tool - Ver. @VERSION@\n"
- "USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
-/* 2040 */ "bug-gnutls@gnu.org\0"
-/* 2059 */ "\n\n\0"
-/* 2062 */ "\n"
- "Ocsptool is a program that can parse and print information about OCSP\n"
+/* 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 */ "Ask an OCSP/HTTP server on a certificate validity\0"
+/* 1049 */ "ASK\0"
+/* 1053 */ "ask\0"
+/* 1057 */ "Verify response\0"
+/* 1073 */ "VERIFY_RESPONSE\0"
+/* 1089 */ "verify-response\0"
+/* 1105 */ "Print information on a OCSP request\0"
+/* 1141 */ "REQUEST_INFO\0"
+/* 1154 */ "request-info\0"
+/* 1167 */ "Print information on a OCSP response\0"
+/* 1204 */ "RESPONSE_INFO\0"
+/* 1218 */ "response-info\0"
+/* 1232 */ "Generate an OCSP request\0"
+/* 1257 */ "GENERATE_REQUEST\0"
+/* 1274 */ "generate-request\0"
+/* 1291 */ "Don't add nonce to OCSP request\0"
+/* 1323 */ "NONCE\0"
+/* 1329 */ "no-nonce\0"
+/* 1338 */ "no\0"
+/* 1341 */ "Read issuer certificate from file\0"
+/* 1375 */ "LOAD_ISSUER\0"
+/* 1387 */ "load-issuer\0"
+/* 1399 */ "Read certificate to check from file\0"
+/* 1435 */ "LOAD_CERT\0"
+/* 1445 */ "load-cert\0"
+/* 1455 */ "Read OCSP trust anchors from file\0"
+/* 1489 */ "LOAD_TRUST\0"
+/* 1500 */ "load-trust\0"
+/* 1511 */ "Read OCSP response signer from file\0"
+/* 1547 */ "LOAD_SIGNER\0"
+/* 1559 */ "load-signer\0"
+/* 1571 */ "Use DER format for input certificates and private keys\0"
+/* 1626 */ "INDER\0"
+/* 1632 */ "no-inder\0"
+/* 1641 */ "Read DER encoded OCSP request from file\0"
+/* 1681 */ "LOAD_REQUEST\0"
+/* 1694 */ "load-request\0"
+/* 1707 */ "Read DER encoded OCSP response from file\0"
+/* 1748 */ "LOAD_RESPONSE\0"
+/* 1762 */ "load-response\0"
+/* 1776 */ "display extended usage information and exit\0"
+/* 1820 */ "help\0"
+/* 1825 */ "extended usage information passed thru pager\0"
+/* 1870 */ "more-help\0"
+/* 1880 */ "output version information and exit\0"
+/* 1916 */ "version\0"
+/* 1924 */ "OCSPTOOL\0"
+/* 1933 */ "ocsptool - GnuTLS OCSP tool\n"
+ "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
+/* 2019 */ "bug-gnutls@gnu.org\0"
+/* 2038 */ "\n\0"
+/* 2040 */ "Ocsptool is a program that can parse and print information about OCSP\n"
"requests/responses, generate requests and verify responses.\n\0"
-/* 2194 */ "ocsptool @VERSION@\0"
-/* 2213 */ "ocsptool [options]\n"
+/* 2171 */ "ocsptool @VERSION@\0"
+/* 2190 */ "ocsptool [options]\n"
"ocsptool --help for usage instructions.\n";
-/*
+/**
* debug option description:
*/
-#define DEBUG_DESC (ocsptool_opt_strs+884)
-#define DEBUG_NAME (ocsptool_opt_strs+902)
-#define DEBUG_name (ocsptool_opt_strs+908)
+/** Descriptive text for the debug option */
+#define DEBUG_DESC (ocsptool_opt_strs+880)
+/** Upper-cased name for the debug option */
+#define DEBUG_NAME (ocsptool_opt_strs+898)
+/** Name string for the debug option */
+#define DEBUG_name (ocsptool_opt_strs+904)
+/** Compiled in flag settings for the debug option */
#define DEBUG_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* verbose option description:
*/
-#define VERBOSE_DESC (ocsptool_opt_strs+914)
-#define VERBOSE_NAME (ocsptool_opt_strs+934)
-#define VERBOSE_name (ocsptool_opt_strs+942)
+/** Descriptive text for the verbose option */
+#define VERBOSE_DESC (ocsptool_opt_strs+910)
+/** Upper-cased name for the verbose option */
+#define VERBOSE_NAME (ocsptool_opt_strs+930)
+/** Name string for the verbose option */
+#define VERBOSE_name (ocsptool_opt_strs+938)
+/** Compiled in flag settings for the verbose option */
#define VERBOSE_FLAGS (OPTST_DISABLED)
-/*
+/**
* infile option description:
*/
-#define INFILE_DESC (ocsptool_opt_strs+950)
-#define INFILE_NAME (ocsptool_opt_strs+961)
-#define INFILE_name (ocsptool_opt_strs+968)
+/** Descriptive text for the infile option */
+#define INFILE_DESC (ocsptool_opt_strs+946)
+/** Upper-cased name for the infile option */
+#define INFILE_NAME (ocsptool_opt_strs+957)
+/** Name string for the infile option */
+#define INFILE_name (ocsptool_opt_strs+964)
+/** Compiled in flag settings for the infile option */
#define INFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* outfile option description:
*/
-#define OUTFILE_DESC (ocsptool_opt_strs+975)
-#define OUTFILE_NAME (ocsptool_opt_strs+987)
-#define OUTFILE_name (ocsptool_opt_strs+995)
+/** Descriptive text for the outfile option */
+#define OUTFILE_DESC (ocsptool_opt_strs+971)
+/** Upper-cased name for the outfile option */
+#define OUTFILE_NAME (ocsptool_opt_strs+983)
+/** Name string for the outfile option */
+#define OUTFILE_name (ocsptool_opt_strs+991)
+/** Compiled in flag settings for the outfile option */
#define OUTFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* ask option description with
* "Must also have options" and "Incompatible options":
*/
-#define ASK_DESC (ocsptool_opt_strs+1003)
-#define ASK_NAME (ocsptool_opt_strs+1053)
-#define ASK_name (ocsptool_opt_strs+1057)
+/** Descriptive text for the ask option */
+#define ASK_DESC (ocsptool_opt_strs+999)
+/** Upper-cased name for the ask option */
+#define ASK_NAME (ocsptool_opt_strs+1049)
+/** Name string for the ask option */
+#define ASK_name (ocsptool_opt_strs+1053)
+/** Other options that are required by the ask option */
static int const aAskMustList[] = {
INDEX_OPT_LOAD_CERT,
INDEX_OPT_LOAD_ISSUER, NO_EQUIVALENT };
+/** Compiled in flag settings for the ask option */
#define ASK_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL)
-/*
+/**
* verify-response option description:
*/
-#define VERIFY_RESPONSE_DESC (ocsptool_opt_strs+1061)
-#define VERIFY_RESPONSE_NAME (ocsptool_opt_strs+1077)
-#define VERIFY_RESPONSE_name (ocsptool_opt_strs+1093)
+/** Descriptive text for the verify-response option */
+#define VERIFY_RESPONSE_DESC (ocsptool_opt_strs+1057)
+/** Upper-cased name for the verify-response option */
+#define VERIFY_RESPONSE_NAME (ocsptool_opt_strs+1073)
+/** Name string for the verify-response option */
+#define VERIFY_RESPONSE_name (ocsptool_opt_strs+1089)
+/** Compiled in flag settings for the verify-response option */
#define VERIFY_RESPONSE_FLAGS (OPTST_DISABLED)
-/*
+/**
* request-info option description:
*/
-#define REQUEST_INFO_DESC (ocsptool_opt_strs+1109)
-#define REQUEST_INFO_NAME (ocsptool_opt_strs+1145)
-#define REQUEST_INFO_name (ocsptool_opt_strs+1158)
+/** Descriptive text for the request-info option */
+#define REQUEST_INFO_DESC (ocsptool_opt_strs+1105)
+/** Upper-cased name for the request-info option */
+#define REQUEST_INFO_NAME (ocsptool_opt_strs+1141)
+/** Name string for the request-info option */
+#define REQUEST_INFO_name (ocsptool_opt_strs+1154)
+/** Compiled in flag settings for the request-info option */
#define REQUEST_INFO_FLAGS (OPTST_DISABLED)
-/*
+/**
* response-info option description:
*/
-#define RESPONSE_INFO_DESC (ocsptool_opt_strs+1171)
-#define RESPONSE_INFO_NAME (ocsptool_opt_strs+1208)
-#define RESPONSE_INFO_name (ocsptool_opt_strs+1222)
+/** Descriptive text for the response-info option */
+#define RESPONSE_INFO_DESC (ocsptool_opt_strs+1167)
+/** Upper-cased name for the response-info option */
+#define RESPONSE_INFO_NAME (ocsptool_opt_strs+1204)
+/** Name string for the response-info option */
+#define RESPONSE_INFO_name (ocsptool_opt_strs+1218)
+/** Compiled in flag settings for the response-info option */
#define RESPONSE_INFO_FLAGS (OPTST_DISABLED)
-/*
+/**
* generate-request option description:
*/
-#define GENERATE_REQUEST_DESC (ocsptool_opt_strs+1236)
-#define GENERATE_REQUEST_NAME (ocsptool_opt_strs+1261)
-#define GENERATE_REQUEST_name (ocsptool_opt_strs+1278)
+/** Descriptive text for the generate-request option */
+#define GENERATE_REQUEST_DESC (ocsptool_opt_strs+1232)
+/** Upper-cased name for the generate-request option */
+#define GENERATE_REQUEST_NAME (ocsptool_opt_strs+1257)
+/** Name string for the generate-request option */
+#define GENERATE_REQUEST_name (ocsptool_opt_strs+1274)
+/** Compiled in flag settings for the generate-request option */
#define GENERATE_REQUEST_FLAGS (OPTST_DISABLED)
-/*
+/**
* nonce option description:
*/
-#define NONCE_DESC (ocsptool_opt_strs+1295)
-#define NONCE_NAME (ocsptool_opt_strs+1327)
-#define NOT_NONCE_name (ocsptool_opt_strs+1333)
-#define NOT_NONCE_PFX (ocsptool_opt_strs+1342)
+/** Descriptive text for the nonce option */
+#define NONCE_DESC (ocsptool_opt_strs+1291)
+/** Upper-cased name for the nonce option */
+#define NONCE_NAME (ocsptool_opt_strs+1323)
+/** disablement name for the nonce option */
+#define NOT_NONCE_name (ocsptool_opt_strs+1329)
+/** disablement prefix for the nonce option */
+#define NOT_NONCE_PFX (ocsptool_opt_strs+1338)
+/** Name string for the nonce option */
#define NONCE_name (NOT_NONCE_name + 3)
+/** Compiled in flag settings for the nonce option */
#define NONCE_FLAGS (OPTST_DISABLED)
-/*
+/**
* load-issuer option description:
*/
-#define LOAD_ISSUER_DESC (ocsptool_opt_strs+1345)
-#define LOAD_ISSUER_NAME (ocsptool_opt_strs+1379)
-#define LOAD_ISSUER_name (ocsptool_opt_strs+1391)
+/** Descriptive text for the load-issuer option */
+#define LOAD_ISSUER_DESC (ocsptool_opt_strs+1341)
+/** Upper-cased name for the load-issuer option */
+#define LOAD_ISSUER_NAME (ocsptool_opt_strs+1375)
+/** Name string for the load-issuer option */
+#define LOAD_ISSUER_name (ocsptool_opt_strs+1387)
+/** Compiled in flag settings for the load-issuer option */
#define LOAD_ISSUER_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* load-cert option description:
*/
-#define LOAD_CERT_DESC (ocsptool_opt_strs+1403)
-#define LOAD_CERT_NAME (ocsptool_opt_strs+1439)
-#define LOAD_CERT_name (ocsptool_opt_strs+1449)
+/** Descriptive text for the load-cert option */
+#define LOAD_CERT_DESC (ocsptool_opt_strs+1399)
+/** Upper-cased name for the load-cert option */
+#define LOAD_CERT_NAME (ocsptool_opt_strs+1435)
+/** Name string for the load-cert option */
+#define LOAD_CERT_name (ocsptool_opt_strs+1445)
+/** Compiled in flag settings for the load-cert option */
#define LOAD_CERT_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* load-trust option description with
* "Must also have options" and "Incompatible options":
*/
-#define LOAD_TRUST_DESC (ocsptool_opt_strs+1459)
-#define LOAD_TRUST_NAME (ocsptool_opt_strs+1493)
-#define LOAD_TRUST_name (ocsptool_opt_strs+1504)
+/** Descriptive text for the load-trust option */
+#define LOAD_TRUST_DESC (ocsptool_opt_strs+1455)
+/** Upper-cased name for the load-trust option */
+#define LOAD_TRUST_NAME (ocsptool_opt_strs+1489)
+/** Name string for the load-trust option */
+#define LOAD_TRUST_name (ocsptool_opt_strs+1500)
+/** Other options that appear in conjunction with the load-trust option */
static int const aLoad_TrustCantList[] = {
INDEX_OPT_LOAD_SIGNER, NO_EQUIVALENT };
+/** Compiled in flag settings for the load-trust option */
#define LOAD_TRUST_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* load-signer option description with
* "Must also have options" and "Incompatible options":
*/
-#define LOAD_SIGNER_DESC (ocsptool_opt_strs+1515)
-#define LOAD_SIGNER_NAME (ocsptool_opt_strs+1551)
-#define LOAD_SIGNER_name (ocsptool_opt_strs+1563)
+/** Descriptive text for the load-signer option */
+#define LOAD_SIGNER_DESC (ocsptool_opt_strs+1511)
+/** Upper-cased name for the load-signer option */
+#define LOAD_SIGNER_NAME (ocsptool_opt_strs+1547)
+/** Name string for the load-signer option */
+#define LOAD_SIGNER_name (ocsptool_opt_strs+1559)
+/** Other options that appear in conjunction with the load-signer option */
static int const aLoad_SignerCantList[] = {
INDEX_OPT_LOAD_TRUST, NO_EQUIVALENT };
+/** Compiled in flag settings for the load-signer option */
#define LOAD_SIGNER_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* inder option description:
*/
-#define INDER_DESC (ocsptool_opt_strs+1575)
-#define INDER_NAME (ocsptool_opt_strs+1630)
-#define NOT_INDER_name (ocsptool_opt_strs+1636)
-#define NOT_INDER_PFX (ocsptool_opt_strs+1342)
+/** Descriptive text for the inder option */
+#define INDER_DESC (ocsptool_opt_strs+1571)
+/** Upper-cased name for the inder option */
+#define INDER_NAME (ocsptool_opt_strs+1626)
+/** disablement name for the inder option */
+#define NOT_INDER_name (ocsptool_opt_strs+1632)
+/** disablement prefix for the inder option */
+#define NOT_INDER_PFX (ocsptool_opt_strs+1338)
+/** Name string for the inder option */
#define INDER_name (NOT_INDER_name + 3)
+/** Compiled in flag settings for the inder option */
#define INDER_FLAGS (OPTST_DISABLED)
-/*
+/**
* load-request option description:
*/
-#define LOAD_REQUEST_DESC (ocsptool_opt_strs+1645)
-#define LOAD_REQUEST_NAME (ocsptool_opt_strs+1685)
-#define LOAD_REQUEST_name (ocsptool_opt_strs+1698)
+/** Descriptive text for the load-request option */
+#define LOAD_REQUEST_DESC (ocsptool_opt_strs+1641)
+/** Upper-cased name for the load-request option */
+#define LOAD_REQUEST_NAME (ocsptool_opt_strs+1681)
+/** Name string for the load-request option */
+#define LOAD_REQUEST_name (ocsptool_opt_strs+1694)
+/** Compiled in flag settings for the load-request option */
#define LOAD_REQUEST_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* load-response option description:
*/
-#define LOAD_RESPONSE_DESC (ocsptool_opt_strs+1711)
-#define LOAD_RESPONSE_NAME (ocsptool_opt_strs+1752)
-#define LOAD_RESPONSE_name (ocsptool_opt_strs+1766)
+/** Descriptive text for the load-response option */
+#define LOAD_RESPONSE_DESC (ocsptool_opt_strs+1707)
+/** Upper-cased name for the load-response option */
+#define LOAD_RESPONSE_NAME (ocsptool_opt_strs+1748)
+/** Name string for the load-response option */
+#define LOAD_RESPONSE_name (ocsptool_opt_strs+1762)
+/** Compiled in flag settings for the load-response option */
#define LOAD_RESPONSE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
/*
* Help/More_Help/Version option descriptions:
*/
-#define HELP_DESC (ocsptool_opt_strs+1780)
-#define HELP_name (ocsptool_opt_strs+1824)
+#define HELP_DESC (ocsptool_opt_strs+1776)
+#define HELP_name (ocsptool_opt_strs+1820)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (ocsptool_opt_strs+1829)
-#define MORE_HELP_name (ocsptool_opt_strs+1874)
+#define MORE_HELP_DESC (ocsptool_opt_strs+1825)
+#define MORE_HELP_name (ocsptool_opt_strs+1870)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC NULL
@@ -334,9 +403,9 @@ static int const aLoad_SignerCantList[] = {
# define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
#endif
-#define VER_DESC (ocsptool_opt_strs+1884)
-#define VER_name (ocsptool_opt_strs+1920)
-/*
+#define VER_DESC (ocsptool_opt_strs+1880)
+#define VER_name (ocsptool_opt_strs+1916)
+/**
* Declare option callback procedures
*/
extern tOptProc
@@ -565,7 +634,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, 0,
+ /* opt state flags */ VER_FLAGS, AOUSE_VERSION,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -579,7 +648,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, 0,
+ /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -591,7 +660,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, 0,
+ /* opt state flags */ MORE_HELP_FLAGS, AOUSE_MORE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -601,19 +670,24 @@ static tOptDesc optDesc[OPTION_CT] = {
};
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Define the ocsptool Option Environment
- */
-#define zPROGNAME (ocsptool_opt_strs+1928)
-#define zUsageTitle (ocsptool_opt_strs+1937)
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/** Reference to the upper cased version of ocsptool. */
+#define zPROGNAME (ocsptool_opt_strs+1924)
+/** Reference to the title line for ocsptool usage. */
+#define zUsageTitle (ocsptool_opt_strs+1933)
+/** There is no ocsptool configuration file. */
#define zRcName NULL
+/** There are no directories to search for ocsptool config files. */
#define apzHomeList NULL
-#define zBugsAddr (ocsptool_opt_strs+2040)
-#define zExplain (ocsptool_opt_strs+2059)
-#define zDetail (ocsptool_opt_strs+2062)
-#define zFullVersion (ocsptool_opt_strs+2194)
-/* extracted from optcode.tlib near line 350 */
+/** The ocsptool program bug email address. */
+#define zBugsAddr (ocsptool_opt_strs+2019)
+/** Clarification/explanation of what ocsptool does. */
+#define zExplain (ocsptool_opt_strs+2038)
+/** Extra detail explaining what ocsptool does. */
+#define zDetail (ocsptool_opt_strs+2040)
+/** The full version string for ocsptool. */
+#define zFullVersion (ocsptool_opt_strs+2171)
+/* extracted from optcode.tlib near line 371 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT
@@ -623,10 +697,8 @@ static tOptDesc optDesc[OPTION_CT] = {
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
-
#define ocsptool_full_usage (NULL)
-
-#define ocsptool_short_usage (ocsptool_opt_strs+2213)
+#define ocsptool_short_usage (ocsptool_opt_strs+2190)
#endif /* not defined __doxygen__ */
@@ -636,8 +708,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/**
* The callout function that invokes the optionUsage function.
*
- * @param pOptions the AutoOpts option description structure
- * @param pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] pOptions the AutoOpts option description structure
+ * @param[in] pOptDesc the descriptor for the "help" (usage) option.
* @noreturn
*/
static void
@@ -652,9 +724,9 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Code to handle the debug option.
- *
- * @param pOptions the ocsptool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * Specifies the debug level.
+ * @param[in] pOptions the ocsptool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -680,8 +752,7 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
@@ -689,8 +760,8 @@ emit_ranges:
/**
* Code to handle the infile option.
*
- * @param pOptions the ocsptool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the ocsptool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptInfile(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -703,6 +774,9 @@ doOptInfile(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -710,8 +784,8 @@ doOptInfile(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the load-issuer option.
*
- * @param pOptions the ocsptool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the ocsptool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptLoad_Issuer(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -724,6 +798,9 @@ doOptLoad_Issuer(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -731,8 +808,8 @@ doOptLoad_Issuer(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the load-cert option.
*
- * @param pOptions the ocsptool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the ocsptool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptLoad_Cert(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -745,6 +822,9 @@ doOptLoad_Cert(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -752,8 +832,8 @@ doOptLoad_Cert(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the load-trust option.
*
- * @param pOptions the ocsptool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the ocsptool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptLoad_Trust(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -766,6 +846,9 @@ doOptLoad_Trust(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -773,8 +856,8 @@ doOptLoad_Trust(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the load-signer option.
*
- * @param pOptions the ocsptool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the ocsptool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptLoad_Signer(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -787,6 +870,9 @@ doOptLoad_Signer(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -794,8 +880,8 @@ doOptLoad_Signer(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the load-request option.
*
- * @param pOptions the ocsptool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the ocsptool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptLoad_Request(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -808,6 +894,9 @@ doOptLoad_Request(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -815,8 +904,8 @@ doOptLoad_Request(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the load-response option.
*
- * @param pOptions the ocsptool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the ocsptool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptLoad_Response(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -829,9 +918,12 @@ doOptLoad_Response(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
-/* extracted from optmain.tlib near line 1113 */
+/* extracted from optmain.tlib near line 1254 */
/**
* The directory containing the data associated with ocsptool.
@@ -847,6 +939,7 @@ doOptLoad_Response(tOptions* pOptions, tOptDesc* pOptDesc)
#ifndef WITH_PACKAGER
# define ocsptool_packager_info NULL
#else
+/** Packager information for ocsptool. */
static char const ocsptool_packager_info[] =
"Packaged by " WITH_PACKAGER
@@ -902,42 +995,69 @@ tOptions ocsptoolOptions = {
};
#if ENABLE_NLS
+/**
+ * This code is designed to translate translatable option text for the
+ * ocsptool program. These translations happen upon entry
+ * to optionProcess().
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
#include <autoopts/usage-txt.h>
-static char* AO_gettext(char const* pz);
-static void coerce_it(void** s);
+static char * AO_gettext(char const * pz);
+static void coerce_it(void ** s);
/**
- * AutoGen specific wrapper function for gettext.
- * It relies on the macro _() to convert from English to the target
- * language, then strdup-duplicates the result string.
+ * AutoGen specific wrapper function for gettext. It relies on the macro _()
+ * to convert from English to the target language, then strdup-duplicates the
+ * result string. It tries the "libopts" domain first, then whatever has been
+ * set via the \a textdomain(3) call.
*
* @param[in] pz the input text used as a lookup key.
* @returns the translated text (if there is one),
* or the original text (if not).
*/
static char *
-AO_gettext(char const* pz)
+AO_gettext(char const * pz)
{
- char* pzRes;
+ char * res;
if (pz == NULL)
return NULL;
- pzRes = _(pz);
- if (pzRes == pz)
- return pzRes;
- pzRes = strdup(pzRes);
- if (pzRes == NULL) {
+#ifdef HAVE_DCGETTEXT
+ /*
+ * While processing the option_xlateable_txt data, try to use the
+ * "libopts" domain. Once we switch to the option descriptor data,
+ * do *not* use that domain.
+ */
+ if (option_xlateable_txt.field_ct != 0) {
+ res = dgettext("libopts", pz);
+ if (res == pz)
+ res = (char *)(void *)_(pz);
+ } else
+ res = (char *)(void *)_(pz);
+#else
+ res = (char *)(void *)_(pz);
+#endif
+ if (res == pz)
+ return res;
+ res = strdup(res);
+ if (res == NULL) {
fputs(_("No memory for duping translated strings\n"), stderr);
exit(OCSPTOOL_EXIT_FAILURE);
}
- return pzRes;
+ return res;
}
-static void coerce_it(void** s) { *s = AO_gettext(*s);
+/**
+ * All the pointers we use are marked "* const", but they are stored in
+ * writable memory. Coerce the mutability and set the pointer.
+ */
+static void coerce_it(void ** s) { *s = AO_gettext(*s);
}
/**
@@ -947,56 +1067,453 @@ static void coerce_it(void** s) { *s = AO_gettext(*s);
static void
translate_option_strings(void)
{
- tOptions * const pOpt = &ocsptoolOptions;
+ tOptions * const opts = &ocsptoolOptions;
/*
* Guard against re-translation. It won't work. The strings will have
* been changed by the first pass through this code. One shot only.
*/
- if (option_usage_text.field_ct != 0) {
+ if (option_xlateable_txt.field_ct != 0) {
/*
* Do the translations. The first pointer follows the field count
* field. The field count field is the size of a pointer.
*/
- tOptDesc * pOD = pOpt->pOptDesc;
- char ** ppz = (char**)(void*)&(option_usage_text);
- int ix = option_usage_text.field_ct;
+ char ** ppz = (char**)(void*)&(option_xlateable_txt);
+ int ix = option_xlateable_txt.field_ct;
do {
- ppz++;
+ ppz++; /* skip over field_ct */
*ppz = AO_gettext(*ppz);
} while (--ix > 0);
-
- coerce_it((void*)&(pOpt->pzCopyright));
- coerce_it((void*)&(pOpt->pzCopyNotice));
- coerce_it((void*)&(pOpt->pzFullVersion));
- coerce_it((void*)&(pOpt->pzUsageTitle));
- coerce_it((void*)&(pOpt->pzExplain));
- coerce_it((void*)&(pOpt->pzDetail));
- coerce_it((void*)&(pOpt->pzPackager));
- coerce_it((void*)&(pOpt->pzShortUsage));
- option_usage_text.field_ct = 0;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++)
- coerce_it((void*)&(pOD->pzText));
- }
-
- if ((pOpt->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
- tOptDesc * pOD = pOpt->pOptDesc;
- int ix;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++) {
- coerce_it((void*)&(pOD->pz_Name));
- coerce_it((void*)&(pOD->pz_DisableName));
- coerce_it((void*)&(pOD->pz_DisablePfx));
+ /* prevent re-translation and disable "libopts" domain lookup */
+ option_xlateable_txt.field_ct = 0;
+
+ coerce_it((void*)&(opts->pzCopyright));
+ coerce_it((void*)&(opts->pzCopyNotice));
+ coerce_it((void*)&(opts->pzFullVersion));
+ 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));
}
- /* prevent re-translation */
- ocsptoolOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
}
-
#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 ocsptoolOptions structure noted in the comments below. The
+ literal text is defined in ocsptool_opt_strs.
+
+ NOTE: the strings below are segmented with respect to the source string
+ ocsptool_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 ocsptoolOptions.pzCopyright */
+ puts(_("ocsptool @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 ocsptoolOptions.pzCopyNotice */
+ puts(_("ocsptool 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(_("ocsptool 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 ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Enable debugging."));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("More verbose output"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Input file"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Output file"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Ask an OCSP/HTTP server on a certificate validity"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Verify response"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Print information on a OCSP request"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Print information on a OCSP response"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Generate an OCSP request"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Don't add nonce to OCSP request"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Read issuer certificate from file"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Read certificate to check from file"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Read OCSP trust anchors from file"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Read OCSP response signer from file"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Use DER format for input certificates and private keys"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Read DER encoded OCSP request from file"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("Read DER encoded OCSP response from file"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("display extended usage information and exit"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("extended usage information passed thru pager"));
+
+ /* referenced via ocsptoolOptions.pOptDesc->pzText */
+ puts(_("output version information and exit"));
+
+ /* referenced via ocsptoolOptions.pzUsageTitle */
+ puts(_("ocsptool - GnuTLS OCSP tool\n\
+Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
+
+ /* referenced via ocsptoolOptions.pzExplain */
+ puts(_("\n"));
+
+ /* referenced via ocsptoolOptions.pzDetail */
+ puts(_("Ocsptool is a program that can parse and print information about OCSP\n\
+requests/responses, generate requests and verify responses.\n"));
+
+ /* referenced via ocsptoolOptions.pzFullVersion */
+ puts(_("ocsptool @VERSION@"));
+
+ /* referenced via ocsptoolOptions.pzFullUsage */
+ puts(_("<<<NOT-FOUND>>>"));
+
+ /* referenced via ocsptoolOptions.pzShortUsage */
+ puts(_("ocsptool [options]\n\
+ocsptool --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/ocsptool-args.h b/src/ocsptool-args.h
index 9344413bac..adf3a00a57 100644
--- a/src/ocsptool-args.h
+++ b/src/ocsptool-args.h
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (ocsptool-args.h)
- *
- * It has been AutoGen-ed November 8, 2012 at 11:35:48 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:16 PM by AutoGen 5.17.3
* From the definitions ocsptool-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This header file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,24 +21,23 @@
*
* 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>
*
* ocsptool 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.
- *
+ *
* ocsptool 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 ocsptool program.
* These macros are documented in the AutoGen info file in the
@@ -49,22 +48,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 147460
+#define AO_TEMPLATE_VERSION 155648
#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:
+/**
+ * Enumeration of each option type for ocsptool
*/
typedef enum {
INDEX_OPT_DEBUG = 0,
@@ -88,44 +87,63 @@ typedef enum {
INDEX_OPT_HELP = 18,
INDEX_OPT_MORE_HELP = 19
} teOptIndex;
-
+/** count of all options for ocsptool */
#define OPTION_CT 20
+/** ocsptool version */
#define OCSPTOOL_VERSION "@VERSION@"
+/** Full ocsptool version text */
#define OCSPTOOL_FULL_VERSION "ocsptool @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) (ocsptoolOptions.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 ocsptool exit codes
*/
typedef enum {
- OCSPTOOL_EXIT_SUCCESS = 0,
- OCSPTOOL_EXIT_FAILURE = 1,
- OCSPTOOL_EXIT_LIBOPTS_FAILURE = 70
+ OCSPTOOL_EXIT_SUCCESS = 0,
+ OCSPTOOL_EXIT_FAILURE = 1,
+ OCSPTOOL_EXIT_USAGE_ERROR = 64,
+ OCSPTOOL_EXIT_LIBOPTS_FAILURE = 70
} ocsptool_exit_code_t;
-/* * * * * *
- *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/**
* Interface defines for specific options.
+ * @{
*/
#define VALUE_OPT_DEBUG 'd'
@@ -146,8 +164,11 @@ typedef enum {
#define VALUE_OPT_INDER 14
#define VALUE_OPT_LOAD_REQUEST 'Q'
#define VALUE_OPT_LOAD_RESPONSE 'S'
+/** 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
@@ -159,7 +180,7 @@ typedef enum {
ocsptoolOptions.pzCurOpt = NULL)
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*ocsptoolOptions.pUsageProc)(&ocsptoolOptions, c)
-/* extracted from opthead.tlib near line 484 */
+/* extracted from opthead.tlib near line 538 */
#ifdef __cplusplus
extern "C" {
@@ -179,6 +200,12 @@ extern tOptions ocsptoolOptions;
#if defined(ENABLE_NLS)
# ifndef _
# include <stdio.h>
+# ifndef HAVE_GETTEXT
+ extern char * gettext(char const *);
+# else
+# include <libintl.h>
+# endif
+
static inline char* aoGetsText(char const* pz) {
if (pz == NULL) return NULL;
return (char*)gettext(pz);
diff --git a/src/p11tool-args.c b/src/p11tool-args.c
index e70b73d3eb..4bcd764dae 100644
--- a/src/p11tool-args.c
+++ b/src/p11tool-args.c
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (p11tool-args.c)
- *
- * It has been AutoGen-ed November 28, 2012 at 11:45:35 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:16 PM by AutoGen 5.17.3
* From the definitions p11tool-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This source file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,20 +21,19 @@
*
* 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>
*
* p11tool 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.
- *
+ *
* p11tool 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/>.
*/
@@ -53,28 +52,24 @@
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 (p11tool_opt_strs+0)
-#define zLicenseDescrip (p11tool_opt_strs+278)
+#define zLicenseDescrip (p11tool_opt_strs+274)
#ifndef NULL
# define NULL 0
#endif
-/*
- * p11tool option static const strings
+/**
+ * static const strings for p11tool options
*/
-static char const p11tool_opt_strs[3155] =
+static char const p11tool_opt_strs[3135] =
/* 0 */ "p11tool @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\n"
- "GNU General Public License, version 3 or later\n"
- " <http://gnu.org/licenses/gpl.html>\n\0"
-/* 278 */ "p11tool is free software: you can redistribute it and/or modify it under\n"
+ "redistribution under the terms of the GNU General Public License,\n"
+ "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0"
+/* 274 */ "p11tool 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"
@@ -84,394 +79,526 @@ static char const p11tool_opt_strs[3155] =
"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"
-/* 881 */ "Enable debugging.\0"
-/* 899 */ "DEBUG\0"
-/* 905 */ "debug\0"
-/* 911 */ "Output file\0"
-/* 923 */ "OUTFILE\0"
-/* 931 */ "outfile\0"
-/* 939 */ "List all available tokens\0"
-/* 965 */ "LIST_TOKENS\0"
-/* 977 */ "list-tokens\0"
-/* 989 */ "Export the object specified by the URL\0"
-/* 1028 */ "EXPORT\0"
-/* 1035 */ "export\0"
-/* 1042 */ "List all available mechanisms in a token\0"
-/* 1083 */ "LIST_MECHANISMS\0"
-/* 1099 */ "list-mechanisms\0"
-/* 1115 */ "List all available objects in a token\0"
-/* 1153 */ "LIST_ALL\0"
-/* 1162 */ "list-all\0"
-/* 1171 */ "List all available certificates in a token\0"
-/* 1214 */ "LIST_ALL_CERTS\0"
-/* 1229 */ "list-all-certs\0"
-/* 1244 */ "List all certificates that have an associated private key\0"
-/* 1302 */ "LIST_CERTS\0"
-/* 1313 */ "list-certs\0"
-/* 1324 */ "List all available private keys in a token\0"
-/* 1367 */ "LIST_ALL_PRIVKEYS\0"
-/* 1385 */ "list-all-privkeys\0"
-/* 1403 */ "List all available certificates marked as trusted\0"
-/* 1453 */ "LIST_ALL_TRUSTED\0"
-/* 1470 */ "list-all-trusted\0"
-/* 1487 */ "Initializes a PKCS #11 token\0"
-/* 1516 */ "INITIALIZE\0"
-/* 1527 */ "initialize\0"
-/* 1538 */ "Writes the loaded objects to a PKCS #11 token\0"
-/* 1584 */ "WRITE\0"
-/* 1590 */ "write\0"
-/* 1596 */ "Deletes the objects matching the PKCS #11 URL\0"
-/* 1642 */ "DELETE\0"
-/* 1649 */ "delete\0"
-/* 1656 */ "Generate an RSA private-public key pair\0"
-/* 1696 */ "GENERATE_RSA\0"
-/* 1709 */ "generate-rsa\0"
-/* 1722 */ "GENERATE_DSA\0"
-/* 1735 */ "generate-dsa\0"
-/* 1748 */ "GENERATE_ECC\0"
-/* 1761 */ "generate-ecc\0"
-/* 1774 */ "Sets a label for the write operation\0"
-/* 1811 */ "LABEL\0"
-/* 1817 */ "label\0"
-/* 1823 */ "Marks the object to be written as trusted\0"
-/* 1865 */ "TRUSTED\0"
-/* 1873 */ "no-trusted\0"
-/* 1884 */ "no\0"
-/* 1887 */ "Marks the object to be written as private\0"
-/* 1929 */ "PRIVATE\0"
-/* 1937 */ "no-private\0"
-/* 1948 */ "Force login to token\0"
-/* 1969 */ "LOGIN\0"
-/* 1975 */ "no-login\0"
-/* 1984 */ "Print detailed URLs\0"
-/* 2004 */ "DETAILED_URL\0"
-/* 2017 */ "no-detailed-url\0"
-/* 2033 */ "Provide a hex encoded secret key\0"
-/* 2066 */ "SECRET_KEY\0"
-/* 2077 */ "secret-key\0"
-/* 2088 */ "Private key file to use\0"
-/* 2112 */ "LOAD_PRIVKEY\0"
-/* 2125 */ "load-privkey\0"
-/* 2138 */ "Public key file to use\0"
-/* 2161 */ "LOAD_PUBKEY\0"
-/* 2173 */ "load-pubkey\0"
-/* 2185 */ "Certificate file to use\0"
-/* 2209 */ "LOAD_CERTIFICATE\0"
-/* 2226 */ "load-certificate\0"
-/* 2243 */ "Use PKCS #8 format for private keys\0"
-/* 2279 */ "PKCS8\0"
-/* 2285 */ "pkcs8\0"
-/* 2291 */ "Specify the number of bits for key generate\0"
-/* 2335 */ "BITS\0"
-/* 2340 */ "bits\0"
-/* 2345 */ "Specify the security level\0"
-/* 2372 */ "SEC_PARAM\0"
-/* 2382 */ "sec-param\0"
-/* 2392 */ "Use DER/RAW format for input\0"
-/* 2421 */ "INDER\0"
-/* 2427 */ "no-inder\0"
-/* 2436 */ "This is an alias for 'inder'\0"
-/* 2465 */ "inraw\0"
-/* 2471 */ "Specify the PKCS #11 provider library\0"
-/* 2509 */ "PROVIDER\0"
-/* 2518 */ "provider\0"
-/* 2527 */ "Display extended usage information and exit\0"
-/* 2571 */ "help\0"
-/* 2576 */ "Extended usage information passed thru pager\0"
-/* 2621 */ "more-help\0"
-/* 2631 */ "Output version information and exit\0"
-/* 2667 */ "version\0"
-/* 2675 */ "P11TOOL\0"
-/* 2683 */ "p11tool - GnuTLS PKCS #11 tool - Ver. @VERSION@\n"
- "USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [url]\n\0"
-/* 2795 */ "bug-gnutls@gnu.org\0"
-/* 2814 */ "\n\n\0"
-/* 2817 */ "\n"
- "Program that allows handling data from PKCS #11 smart cards and security\n"
+/* 877 */ "Enable debugging.\0"
+/* 895 */ "DEBUG\0"
+/* 901 */ "debug\0"
+/* 907 */ "Output file\0"
+/* 919 */ "OUTFILE\0"
+/* 927 */ "outfile\0"
+/* 935 */ "List all available tokens\0"
+/* 961 */ "LIST_TOKENS\0"
+/* 973 */ "list-tokens\0"
+/* 985 */ "Export the object specified by the URL\0"
+/* 1024 */ "EXPORT\0"
+/* 1031 */ "export\0"
+/* 1038 */ "List all available mechanisms in a token\0"
+/* 1079 */ "LIST_MECHANISMS\0"
+/* 1095 */ "list-mechanisms\0"
+/* 1111 */ "List all available objects in a token\0"
+/* 1149 */ "LIST_ALL\0"
+/* 1158 */ "list-all\0"
+/* 1167 */ "List all available certificates in a token\0"
+/* 1210 */ "LIST_ALL_CERTS\0"
+/* 1225 */ "list-all-certs\0"
+/* 1240 */ "List all certificates that have an associated private key\0"
+/* 1298 */ "LIST_CERTS\0"
+/* 1309 */ "list-certs\0"
+/* 1320 */ "List all available private keys in a token\0"
+/* 1363 */ "LIST_ALL_PRIVKEYS\0"
+/* 1381 */ "list-all-privkeys\0"
+/* 1399 */ "List all available certificates marked as trusted\0"
+/* 1449 */ "LIST_ALL_TRUSTED\0"
+/* 1466 */ "list-all-trusted\0"
+/* 1483 */ "Initializes a PKCS #11 token\0"
+/* 1512 */ "INITIALIZE\0"
+/* 1523 */ "initialize\0"
+/* 1534 */ "Writes the loaded objects to a PKCS #11 token\0"
+/* 1580 */ "WRITE\0"
+/* 1586 */ "write\0"
+/* 1592 */ "Deletes the objects matching the PKCS #11 URL\0"
+/* 1638 */ "DELETE\0"
+/* 1645 */ "delete\0"
+/* 1652 */ "Generate an RSA private-public key pair\0"
+/* 1692 */ "GENERATE_RSA\0"
+/* 1705 */ "generate-rsa\0"
+/* 1718 */ "GENERATE_DSA\0"
+/* 1731 */ "generate-dsa\0"
+/* 1744 */ "GENERATE_ECC\0"
+/* 1757 */ "generate-ecc\0"
+/* 1770 */ "Sets a label for the write operation\0"
+/* 1807 */ "LABEL\0"
+/* 1813 */ "label\0"
+/* 1819 */ "Marks the object to be written as trusted\0"
+/* 1861 */ "TRUSTED\0"
+/* 1869 */ "no-trusted\0"
+/* 1880 */ "no\0"
+/* 1883 */ "Marks the object to be written as private\0"
+/* 1925 */ "PRIVATE\0"
+/* 1933 */ "no-private\0"
+/* 1944 */ "Force login to token\0"
+/* 1965 */ "LOGIN\0"
+/* 1971 */ "no-login\0"
+/* 1980 */ "Print detailed URLs\0"
+/* 2000 */ "DETAILED_URL\0"
+/* 2013 */ "no-detailed-url\0"
+/* 2029 */ "Provide a hex encoded secret key\0"
+/* 2062 */ "SECRET_KEY\0"
+/* 2073 */ "secret-key\0"
+/* 2084 */ "Private key file to use\0"
+/* 2108 */ "LOAD_PRIVKEY\0"
+/* 2121 */ "load-privkey\0"
+/* 2134 */ "Public key file to use\0"
+/* 2157 */ "LOAD_PUBKEY\0"
+/* 2169 */ "load-pubkey\0"
+/* 2181 */ "Certificate file to use\0"
+/* 2205 */ "LOAD_CERTIFICATE\0"
+/* 2222 */ "load-certificate\0"
+/* 2239 */ "Use PKCS #8 format for private keys\0"
+/* 2275 */ "PKCS8\0"
+/* 2281 */ "pkcs8\0"
+/* 2287 */ "Specify the number of bits for key generate\0"
+/* 2331 */ "BITS\0"
+/* 2336 */ "bits\0"
+/* 2341 */ "Specify the security level\0"
+/* 2368 */ "SEC_PARAM\0"
+/* 2378 */ "sec-param\0"
+/* 2388 */ "Use DER/RAW format for input\0"
+/* 2417 */ "INDER\0"
+/* 2423 */ "no-inder\0"
+/* 2432 */ "an alias for the 'inder' option\0"
+/* 2464 */ "inraw\0"
+/* 2470 */ "Specify the PKCS #11 provider library\0"
+/* 2508 */ "PROVIDER\0"
+/* 2517 */ "provider\0"
+/* 2526 */ "display extended usage information and exit\0"
+/* 2570 */ "help\0"
+/* 2575 */ "extended usage information passed thru pager\0"
+/* 2620 */ "more-help\0"
+/* 2630 */ "output version information and exit\0"
+/* 2666 */ "version\0"
+/* 2674 */ "P11TOOL\0"
+/* 2682 */ "p11tool - GnuTLS PKCS #11 tool\n"
+ "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [url]\n\0"
+/* 2777 */ "bug-gnutls@gnu.org\0"
+/* 2796 */ "\n\0"
+/* 2798 */ "Program that allows handling data from PKCS #11 smart cards and security\n"
"modules.\n\n"
"To use PKCS #11 tokens with gnutls the configuration file\n"
"/etc/gnutls/pkcs11.conf has to exist and contain a number of lines of the\n"
"form 'load=/usr/lib/opensc-pkcs11.so'.\n\0"
-/* 3073 */ "p11tool @VERSION@\0"
-/* 3091 */ "p11tool [options] [url]\n"
+/* 3053 */ "p11tool @VERSION@\0"
+/* 3071 */ "p11tool [options] [url]\n"
"p11tool --help for usage instructions.\n";
-/*
+/**
* debug option description:
*/
-#define DEBUG_DESC (p11tool_opt_strs+881)
-#define DEBUG_NAME (p11tool_opt_strs+899)
-#define DEBUG_name (p11tool_opt_strs+905)
+/** Descriptive text for the debug option */
+#define DEBUG_DESC (p11tool_opt_strs+877)
+/** Upper-cased name for the debug option */
+#define DEBUG_NAME (p11tool_opt_strs+895)
+/** Name string for the debug option */
+#define DEBUG_name (p11tool_opt_strs+901)
+/** Compiled in flag settings for the debug option */
#define DEBUG_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* outfile option description:
*/
-#define OUTFILE_DESC (p11tool_opt_strs+911)
-#define OUTFILE_NAME (p11tool_opt_strs+923)
-#define OUTFILE_name (p11tool_opt_strs+931)
+/** Descriptive text for the outfile option */
+#define OUTFILE_DESC (p11tool_opt_strs+907)
+/** Upper-cased name for the outfile option */
+#define OUTFILE_NAME (p11tool_opt_strs+919)
+/** Name string for the outfile option */
+#define OUTFILE_name (p11tool_opt_strs+927)
+/** Compiled in flag settings for the outfile option */
#define OUTFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* list-tokens option description:
*/
-#define LIST_TOKENS_DESC (p11tool_opt_strs+939)
-#define LIST_TOKENS_NAME (p11tool_opt_strs+965)
-#define LIST_TOKENS_name (p11tool_opt_strs+977)
+/** Descriptive text for the list-tokens option */
+#define LIST_TOKENS_DESC (p11tool_opt_strs+935)
+/** Upper-cased name for the list-tokens option */
+#define LIST_TOKENS_NAME (p11tool_opt_strs+961)
+/** Name string for the list-tokens option */
+#define LIST_TOKENS_name (p11tool_opt_strs+973)
+/** Compiled in flag settings for the list-tokens option */
#define LIST_TOKENS_FLAGS (OPTST_DISABLED)
-/*
+/**
* export option description:
*/
-#define EXPORT_DESC (p11tool_opt_strs+989)
-#define EXPORT_NAME (p11tool_opt_strs+1028)
-#define EXPORT_name (p11tool_opt_strs+1035)
+/** Descriptive text for the export option */
+#define EXPORT_DESC (p11tool_opt_strs+985)
+/** Upper-cased name for the export option */
+#define EXPORT_NAME (p11tool_opt_strs+1024)
+/** Name string for the export option */
+#define EXPORT_name (p11tool_opt_strs+1031)
+/** Compiled in flag settings for the export option */
#define EXPORT_FLAGS (OPTST_DISABLED)
-/*
+/**
* list-mechanisms option description:
*/
-#define LIST_MECHANISMS_DESC (p11tool_opt_strs+1042)
-#define LIST_MECHANISMS_NAME (p11tool_opt_strs+1083)
-#define LIST_MECHANISMS_name (p11tool_opt_strs+1099)
+/** Descriptive text for the list-mechanisms option */
+#define LIST_MECHANISMS_DESC (p11tool_opt_strs+1038)
+/** Upper-cased name for the list-mechanisms option */
+#define LIST_MECHANISMS_NAME (p11tool_opt_strs+1079)
+/** Name string for the list-mechanisms option */
+#define LIST_MECHANISMS_name (p11tool_opt_strs+1095)
+/** Compiled in flag settings for the list-mechanisms option */
#define LIST_MECHANISMS_FLAGS (OPTST_DISABLED)
-/*
+/**
* list-all option description:
*/
-#define LIST_ALL_DESC (p11tool_opt_strs+1115)
-#define LIST_ALL_NAME (p11tool_opt_strs+1153)
-#define LIST_ALL_name (p11tool_opt_strs+1162)
+/** Descriptive text for the list-all option */
+#define LIST_ALL_DESC (p11tool_opt_strs+1111)
+/** Upper-cased name for the list-all option */
+#define LIST_ALL_NAME (p11tool_opt_strs+1149)
+/** Name string for the list-all option */
+#define LIST_ALL_name (p11tool_opt_strs+1158)
+/** Compiled in flag settings for the list-all option */
#define LIST_ALL_FLAGS (OPTST_DISABLED)
-/*
+/**
* list-all-certs option description:
*/
-#define LIST_ALL_CERTS_DESC (p11tool_opt_strs+1171)
-#define LIST_ALL_CERTS_NAME (p11tool_opt_strs+1214)
-#define LIST_ALL_CERTS_name (p11tool_opt_strs+1229)
+/** Descriptive text for the list-all-certs option */
+#define LIST_ALL_CERTS_DESC (p11tool_opt_strs+1167)
+/** Upper-cased name for the list-all-certs option */
+#define LIST_ALL_CERTS_NAME (p11tool_opt_strs+1210)
+/** Name string for the list-all-certs option */
+#define LIST_ALL_CERTS_name (p11tool_opt_strs+1225)
+/** Compiled in flag settings for the list-all-certs option */
#define LIST_ALL_CERTS_FLAGS (OPTST_DISABLED)
-/*
+/**
* list-certs option description:
*/
-#define LIST_CERTS_DESC (p11tool_opt_strs+1244)
-#define LIST_CERTS_NAME (p11tool_opt_strs+1302)
-#define LIST_CERTS_name (p11tool_opt_strs+1313)
+/** Descriptive text for the list-certs option */
+#define LIST_CERTS_DESC (p11tool_opt_strs+1240)
+/** Upper-cased name for the list-certs option */
+#define LIST_CERTS_NAME (p11tool_opt_strs+1298)
+/** Name string for the list-certs option */
+#define LIST_CERTS_name (p11tool_opt_strs+1309)
+/** Compiled in flag settings for the list-certs option */
#define LIST_CERTS_FLAGS (OPTST_DISABLED)
-/*
+/**
* list-all-privkeys option description:
*/
-#define LIST_ALL_PRIVKEYS_DESC (p11tool_opt_strs+1324)
-#define LIST_ALL_PRIVKEYS_NAME (p11tool_opt_strs+1367)
-#define LIST_ALL_PRIVKEYS_name (p11tool_opt_strs+1385)
+/** Descriptive text for the list-all-privkeys option */
+#define LIST_ALL_PRIVKEYS_DESC (p11tool_opt_strs+1320)
+/** Upper-cased name for the list-all-privkeys option */
+#define LIST_ALL_PRIVKEYS_NAME (p11tool_opt_strs+1363)
+/** Name string for the list-all-privkeys option */
+#define LIST_ALL_PRIVKEYS_name (p11tool_opt_strs+1381)
+/** Compiled in flag settings for the list-all-privkeys option */
#define LIST_ALL_PRIVKEYS_FLAGS (OPTST_DISABLED)
-/*
+/**
* list-all-trusted option description:
*/
-#define LIST_ALL_TRUSTED_DESC (p11tool_opt_strs+1403)
-#define LIST_ALL_TRUSTED_NAME (p11tool_opt_strs+1453)
-#define LIST_ALL_TRUSTED_name (p11tool_opt_strs+1470)
+/** Descriptive text for the list-all-trusted option */
+#define LIST_ALL_TRUSTED_DESC (p11tool_opt_strs+1399)
+/** Upper-cased name for the list-all-trusted option */
+#define LIST_ALL_TRUSTED_NAME (p11tool_opt_strs+1449)
+/** Name string for the list-all-trusted option */
+#define LIST_ALL_TRUSTED_name (p11tool_opt_strs+1466)
+/** Compiled in flag settings for the list-all-trusted option */
#define LIST_ALL_TRUSTED_FLAGS (OPTST_DISABLED)
-/*
+/**
* initialize option description:
*/
-#define INITIALIZE_DESC (p11tool_opt_strs+1487)
-#define INITIALIZE_NAME (p11tool_opt_strs+1516)
-#define INITIALIZE_name (p11tool_opt_strs+1527)
+/** Descriptive text for the initialize option */
+#define INITIALIZE_DESC (p11tool_opt_strs+1483)
+/** Upper-cased name for the initialize option */
+#define INITIALIZE_NAME (p11tool_opt_strs+1512)
+/** Name string for the initialize option */
+#define INITIALIZE_name (p11tool_opt_strs+1523)
+/** Compiled in flag settings for the initialize option */
#define INITIALIZE_FLAGS (OPTST_DISABLED)
-/*
+/**
* write option description:
*/
-#define WRITE_DESC (p11tool_opt_strs+1538)
-#define WRITE_NAME (p11tool_opt_strs+1584)
-#define WRITE_name (p11tool_opt_strs+1590)
+/** Descriptive text for the write option */
+#define WRITE_DESC (p11tool_opt_strs+1534)
+/** Upper-cased name for the write option */
+#define WRITE_NAME (p11tool_opt_strs+1580)
+/** Name string for the write option */
+#define WRITE_name (p11tool_opt_strs+1586)
+/** Compiled in flag settings for the write option */
#define WRITE_FLAGS (OPTST_DISABLED)
-/*
+/**
* delete option description:
*/
-#define DELETE_DESC (p11tool_opt_strs+1596)
-#define DELETE_NAME (p11tool_opt_strs+1642)
-#define DELETE_name (p11tool_opt_strs+1649)
+/** Descriptive text for the delete option */
+#define DELETE_DESC (p11tool_opt_strs+1592)
+/** Upper-cased name for the delete option */
+#define DELETE_NAME (p11tool_opt_strs+1638)
+/** Name string for the delete option */
+#define DELETE_name (p11tool_opt_strs+1645)
+/** Compiled in flag settings for the delete option */
#define DELETE_FLAGS (OPTST_DISABLED)
-/*
+/**
* generate-rsa option description:
*/
-#define GENERATE_RSA_DESC (p11tool_opt_strs+1656)
-#define GENERATE_RSA_NAME (p11tool_opt_strs+1696)
-#define GENERATE_RSA_name (p11tool_opt_strs+1709)
+/** Descriptive text for the generate-rsa option */
+#define GENERATE_RSA_DESC (p11tool_opt_strs+1652)
+/** Upper-cased name for the generate-rsa option */
+#define GENERATE_RSA_NAME (p11tool_opt_strs+1692)
+/** Name string for the generate-rsa option */
+#define GENERATE_RSA_name (p11tool_opt_strs+1705)
+/** Compiled in flag settings for the generate-rsa option */
#define GENERATE_RSA_FLAGS (OPTST_DISABLED)
-/*
+/**
* generate-dsa option description:
*/
-#define GENERATE_DSA_DESC (p11tool_opt_strs+1656)
-#define GENERATE_DSA_NAME (p11tool_opt_strs+1722)
-#define GENERATE_DSA_name (p11tool_opt_strs+1735)
+/** Descriptive text for the generate-dsa option */
+#define GENERATE_DSA_DESC (p11tool_opt_strs+1652)
+/** Upper-cased name for the generate-dsa option */
+#define GENERATE_DSA_NAME (p11tool_opt_strs+1718)
+/** Name string for the generate-dsa option */
+#define GENERATE_DSA_name (p11tool_opt_strs+1731)
+/** Compiled in flag settings for the generate-dsa option */
#define GENERATE_DSA_FLAGS (OPTST_DISABLED)
-/*
+/**
* generate-ecc option description:
*/
-#define GENERATE_ECC_DESC (p11tool_opt_strs+1656)
-#define GENERATE_ECC_NAME (p11tool_opt_strs+1748)
-#define GENERATE_ECC_name (p11tool_opt_strs+1761)
+/** Descriptive text for the generate-ecc option */
+#define GENERATE_ECC_DESC (p11tool_opt_strs+1652)
+/** Upper-cased name for the generate-ecc option */
+#define GENERATE_ECC_NAME (p11tool_opt_strs+1744)
+/** Name string for the generate-ecc option */
+#define GENERATE_ECC_name (p11tool_opt_strs+1757)
+/** Compiled in flag settings for the generate-ecc option */
#define GENERATE_ECC_FLAGS (OPTST_DISABLED)
-/*
+/**
* label option description:
*/
-#define LABEL_DESC (p11tool_opt_strs+1774)
-#define LABEL_NAME (p11tool_opt_strs+1811)
-#define LABEL_name (p11tool_opt_strs+1817)
+/** Descriptive text for the label option */
+#define LABEL_DESC (p11tool_opt_strs+1770)
+/** Upper-cased name for the label option */
+#define LABEL_NAME (p11tool_opt_strs+1807)
+/** Name string for the label option */
+#define LABEL_name (p11tool_opt_strs+1813)
+/** Compiled in flag settings for the label option */
#define LABEL_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* trusted option description:
*/
-#define TRUSTED_DESC (p11tool_opt_strs+1823)
-#define TRUSTED_NAME (p11tool_opt_strs+1865)
-#define NOT_TRUSTED_name (p11tool_opt_strs+1873)
-#define NOT_TRUSTED_PFX (p11tool_opt_strs+1884)
+/** Descriptive text for the trusted option */
+#define TRUSTED_DESC (p11tool_opt_strs+1819)
+/** Upper-cased name for the trusted option */
+#define TRUSTED_NAME (p11tool_opt_strs+1861)
+/** disablement name for the trusted option */
+#define NOT_TRUSTED_name (p11tool_opt_strs+1869)
+/** disablement prefix for the trusted option */
+#define NOT_TRUSTED_PFX (p11tool_opt_strs+1880)
+/** Name string for the trusted option */
#define TRUSTED_name (NOT_TRUSTED_name + 3)
+/** Compiled in flag settings for the trusted option */
#define TRUSTED_FLAGS (OPTST_DISABLED)
-/*
+/**
* private option description:
*/
-#define PRIVATE_DESC (p11tool_opt_strs+1887)
-#define PRIVATE_NAME (p11tool_opt_strs+1929)
-#define NOT_PRIVATE_name (p11tool_opt_strs+1937)
-#define NOT_PRIVATE_PFX (p11tool_opt_strs+1884)
+/** Descriptive text for the private option */
+#define PRIVATE_DESC (p11tool_opt_strs+1883)
+/** Upper-cased name for the private option */
+#define PRIVATE_NAME (p11tool_opt_strs+1925)
+/** disablement name for the private option */
+#define NOT_PRIVATE_name (p11tool_opt_strs+1933)
+/** disablement prefix for the private option */
+#define NOT_PRIVATE_PFX (p11tool_opt_strs+1880)
+/** Name string for the private option */
#define PRIVATE_name (NOT_PRIVATE_name + 3)
+/** Compiled in flag settings for the private option */
#define PRIVATE_FLAGS (OPTST_INITENABLED)
-/*
+/**
* login option description:
*/
-#define LOGIN_DESC (p11tool_opt_strs+1948)
-#define LOGIN_NAME (p11tool_opt_strs+1969)
-#define NOT_LOGIN_name (p11tool_opt_strs+1975)
-#define NOT_LOGIN_PFX (p11tool_opt_strs+1884)
+/** Descriptive text for the login option */
+#define LOGIN_DESC (p11tool_opt_strs+1944)
+/** Upper-cased name for the login option */
+#define LOGIN_NAME (p11tool_opt_strs+1965)
+/** disablement name for the login option */
+#define NOT_LOGIN_name (p11tool_opt_strs+1971)
+/** disablement prefix for the login option */
+#define NOT_LOGIN_PFX (p11tool_opt_strs+1880)
+/** Name string for the login option */
#define LOGIN_name (NOT_LOGIN_name + 3)
+/** Compiled in flag settings for the login option */
#define LOGIN_FLAGS (OPTST_DISABLED)
-/*
+/**
* detailed-url option description:
*/
-#define DETAILED_URL_DESC (p11tool_opt_strs+1984)
-#define DETAILED_URL_NAME (p11tool_opt_strs+2004)
-#define NOT_DETAILED_URL_name (p11tool_opt_strs+2017)
-#define NOT_DETAILED_URL_PFX (p11tool_opt_strs+1884)
+/** Descriptive text for the detailed-url option */
+#define DETAILED_URL_DESC (p11tool_opt_strs+1980)
+/** Upper-cased name for the detailed-url option */
+#define DETAILED_URL_NAME (p11tool_opt_strs+2000)
+/** disablement name for the detailed-url option */
+#define NOT_DETAILED_URL_name (p11tool_opt_strs+2013)
+/** disablement prefix for the detailed-url option */
+#define NOT_DETAILED_URL_PFX (p11tool_opt_strs+1880)
+/** Name string for the detailed-url option */
#define DETAILED_URL_name (NOT_DETAILED_URL_name + 3)
+/** Compiled in flag settings for the detailed-url option */
#define DETAILED_URL_FLAGS (OPTST_DISABLED)
-/*
+/**
* secret-key option description:
*/
-#define SECRET_KEY_DESC (p11tool_opt_strs+2033)
-#define SECRET_KEY_NAME (p11tool_opt_strs+2066)
-#define SECRET_KEY_name (p11tool_opt_strs+2077)
+/** Descriptive text for the secret-key option */
+#define SECRET_KEY_DESC (p11tool_opt_strs+2029)
+/** Upper-cased name for the secret-key option */
+#define SECRET_KEY_NAME (p11tool_opt_strs+2062)
+/** Name string for the secret-key option */
+#define SECRET_KEY_name (p11tool_opt_strs+2073)
+/** Compiled in flag settings for the secret-key option */
#define SECRET_KEY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* load-privkey option description:
*/
-#define LOAD_PRIVKEY_DESC (p11tool_opt_strs+2088)
-#define LOAD_PRIVKEY_NAME (p11tool_opt_strs+2112)
-#define LOAD_PRIVKEY_name (p11tool_opt_strs+2125)
+/** Descriptive text for the load-privkey option */
+#define LOAD_PRIVKEY_DESC (p11tool_opt_strs+2084)
+/** Upper-cased name for the load-privkey option */
+#define LOAD_PRIVKEY_NAME (p11tool_opt_strs+2108)
+/** Name string for the load-privkey option */
+#define LOAD_PRIVKEY_name (p11tool_opt_strs+2121)
+/** Compiled in flag settings for the load-privkey option */
#define LOAD_PRIVKEY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* load-pubkey option description:
*/
-#define LOAD_PUBKEY_DESC (p11tool_opt_strs+2138)
-#define LOAD_PUBKEY_NAME (p11tool_opt_strs+2161)
-#define LOAD_PUBKEY_name (p11tool_opt_strs+2173)
+/** Descriptive text for the load-pubkey option */
+#define LOAD_PUBKEY_DESC (p11tool_opt_strs+2134)
+/** Upper-cased name for the load-pubkey option */
+#define LOAD_PUBKEY_NAME (p11tool_opt_strs+2157)
+/** Name string for the load-pubkey option */
+#define LOAD_PUBKEY_name (p11tool_opt_strs+2169)
+/** Compiled in flag settings for the load-pubkey option */
#define LOAD_PUBKEY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* load-certificate option description:
*/
-#define LOAD_CERTIFICATE_DESC (p11tool_opt_strs+2185)
-#define LOAD_CERTIFICATE_NAME (p11tool_opt_strs+2209)
-#define LOAD_CERTIFICATE_name (p11tool_opt_strs+2226)
+/** Descriptive text for the load-certificate option */
+#define LOAD_CERTIFICATE_DESC (p11tool_opt_strs+2181)
+/** Upper-cased name for the load-certificate option */
+#define LOAD_CERTIFICATE_NAME (p11tool_opt_strs+2205)
+/** Name string for the load-certificate option */
+#define LOAD_CERTIFICATE_name (p11tool_opt_strs+2222)
+/** Compiled in flag settings for the load-certificate option */
#define LOAD_CERTIFICATE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* pkcs8 option description:
*/
-#define PKCS8_DESC (p11tool_opt_strs+2243)
-#define PKCS8_NAME (p11tool_opt_strs+2279)
-#define PKCS8_name (p11tool_opt_strs+2285)
+/** Descriptive text for the pkcs8 option */
+#define PKCS8_DESC (p11tool_opt_strs+2239)
+/** Upper-cased name for the pkcs8 option */
+#define PKCS8_NAME (p11tool_opt_strs+2275)
+/** Name string for the pkcs8 option */
+#define PKCS8_name (p11tool_opt_strs+2281)
+/** Compiled in flag settings for the pkcs8 option */
#define PKCS8_FLAGS (OPTST_DISABLED)
-/*
+/**
* bits option description:
*/
-#define BITS_DESC (p11tool_opt_strs+2291)
-#define BITS_NAME (p11tool_opt_strs+2335)
-#define BITS_name (p11tool_opt_strs+2340)
+/** Descriptive text for the bits option */
+#define BITS_DESC (p11tool_opt_strs+2287)
+/** Upper-cased name for the bits option */
+#define BITS_NAME (p11tool_opt_strs+2331)
+/** Name string for the bits option */
+#define BITS_name (p11tool_opt_strs+2336)
+/** Compiled in flag settings for the bits option */
#define BITS_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* sec-param option description:
*/
-#define SEC_PARAM_DESC (p11tool_opt_strs+2345)
-#define SEC_PARAM_NAME (p11tool_opt_strs+2372)
-#define SEC_PARAM_name (p11tool_opt_strs+2382)
+/** Descriptive text for the sec-param option */
+#define SEC_PARAM_DESC (p11tool_opt_strs+2341)
+/** Upper-cased name for the sec-param option */
+#define SEC_PARAM_NAME (p11tool_opt_strs+2368)
+/** Name string for the sec-param option */
+#define SEC_PARAM_name (p11tool_opt_strs+2378)
+/** Compiled in flag settings for the sec-param option */
#define SEC_PARAM_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* inder option description:
*/
-#define INDER_DESC (p11tool_opt_strs+2392)
-#define INDER_NAME (p11tool_opt_strs+2421)
-#define NOT_INDER_name (p11tool_opt_strs+2427)
-#define NOT_INDER_PFX (p11tool_opt_strs+1884)
+/** Descriptive text for the inder option */
+#define INDER_DESC (p11tool_opt_strs+2388)
+/** Upper-cased name for the inder option */
+#define INDER_NAME (p11tool_opt_strs+2417)
+/** disablement name for the inder option */
+#define NOT_INDER_name (p11tool_opt_strs+2423)
+/** disablement prefix for the inder option */
+#define NOT_INDER_PFX (p11tool_opt_strs+1880)
+/** Name string for the inder option */
#define INDER_name (NOT_INDER_name + 3)
+/** Compiled in flag settings for the inder option */
#define INDER_FLAGS (OPTST_DISABLED)
-/*
+/**
* inraw option description:
*/
-#define INRAW_DESC (p11tool_opt_strs+2436)
+/** Descriptive text for the inraw option */
+#define INRAW_DESC (p11tool_opt_strs+2432)
#define INRAW_NAME NULL
-#define INRAW_name (p11tool_opt_strs+2465)
+/** Unmodified name string for the inraw option */
+#define INRAW_name (p11tool_opt_strs+2464)
+/** Compiled in flag settings for the inraw option */
#define INRAW_FLAGS (INDER_FLAGS | OPTST_ALIAS)
-/*
+/**
* provider option description:
*/
-#define PROVIDER_DESC (p11tool_opt_strs+2471)
-#define PROVIDER_NAME (p11tool_opt_strs+2509)
-#define PROVIDER_name (p11tool_opt_strs+2518)
+/** Descriptive text for the provider option */
+#define PROVIDER_DESC (p11tool_opt_strs+2470)
+/** Upper-cased name for the provider option */
+#define PROVIDER_NAME (p11tool_opt_strs+2508)
+/** Name string for the provider option */
+#define PROVIDER_name (p11tool_opt_strs+2517)
+/** Compiled in flag settings for the provider option */
#define PROVIDER_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
/*
* Help/More_Help/Version option descriptions:
*/
-#define HELP_DESC (p11tool_opt_strs+2527)
-#define HELP_name (p11tool_opt_strs+2571)
+#define HELP_DESC (p11tool_opt_strs+2526)
+#define HELP_name (p11tool_opt_strs+2570)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (p11tool_opt_strs+2576)
-#define MORE_HELP_name (p11tool_opt_strs+2621)
+#define MORE_HELP_DESC (p11tool_opt_strs+2575)
+#define MORE_HELP_name (p11tool_opt_strs+2620)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC NULL
@@ -484,9 +611,9 @@ static char const p11tool_opt_strs[3155] =
# define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
#endif
-#define VER_DESC (p11tool_opt_strs+2631)
-#define VER_name (p11tool_opt_strs+2667)
-/*
+#define VER_DESC (p11tool_opt_strs+2630)
+#define VER_name (p11tool_opt_strs+2666)
+/**
* Declare option callback procedures
*/
extern tOptProc
@@ -883,7 +1010,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, 0,
+ /* opt state flags */ VER_FLAGS, AOUSE_VERSION,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -897,7 +1024,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, 0,
+ /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -909,7 +1036,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, 0,
+ /* opt state flags */ MORE_HELP_FLAGS, AOUSE_MORE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -919,19 +1046,24 @@ static tOptDesc optDesc[OPTION_CT] = {
};
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Define the p11tool Option Environment
- */
-#define zPROGNAME (p11tool_opt_strs+2675)
-#define zUsageTitle (p11tool_opt_strs+2683)
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/** Reference to the upper cased version of p11tool. */
+#define zPROGNAME (p11tool_opt_strs+2674)
+/** Reference to the title line for p11tool usage. */
+#define zUsageTitle (p11tool_opt_strs+2682)
+/** There is no p11tool configuration file. */
#define zRcName NULL
+/** There are no directories to search for p11tool config files. */
#define apzHomeList NULL
-#define zBugsAddr (p11tool_opt_strs+2795)
-#define zExplain (p11tool_opt_strs+2814)
-#define zDetail (p11tool_opt_strs+2817)
-#define zFullVersion (p11tool_opt_strs+3073)
-/* extracted from optcode.tlib near line 350 */
+/** The p11tool program bug email address. */
+#define zBugsAddr (p11tool_opt_strs+2777)
+/** Clarification/explanation of what p11tool does. */
+#define zExplain (p11tool_opt_strs+2796)
+/** Extra detail explaining what p11tool does. */
+#define zDetail (p11tool_opt_strs+2798)
+/** The full version string for p11tool. */
+#define zFullVersion (p11tool_opt_strs+3053)
+/* extracted from optcode.tlib near line 371 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT
@@ -941,10 +1073,8 @@ static tOptDesc optDesc[OPTION_CT] = {
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
-
#define p11tool_full_usage (NULL)
-
-#define p11tool_short_usage (p11tool_opt_strs+3091)
+#define p11tool_short_usage (p11tool_opt_strs+3071)
#endif /* not defined __doxygen__ */
@@ -954,8 +1084,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/**
* The callout function that invokes the optionUsage function.
*
- * @param pOptions the AutoOpts option description structure
- * @param pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] pOptions the AutoOpts option description structure
+ * @param[in] pOptDesc the descriptor for the "help" (usage) option.
* @noreturn
*/
static void
@@ -970,9 +1100,9 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Code to handle the debug option.
- *
- * @param pOptions the p11tool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * Specifies the debug level.
+ * @param[in] pOptions the p11tool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -998,8 +1128,7 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
@@ -1007,8 +1136,8 @@ emit_ranges:
/**
* Code to handle the load-privkey option.
*
- * @param pOptions the p11tool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the p11tool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptLoad_Privkey(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1021,6 +1150,9 @@ doOptLoad_Privkey(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1028,8 +1160,8 @@ doOptLoad_Privkey(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the load-pubkey option.
*
- * @param pOptions the p11tool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the p11tool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptLoad_Pubkey(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1042,6 +1174,9 @@ doOptLoad_Pubkey(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1049,8 +1184,8 @@ doOptLoad_Pubkey(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the load-certificate option.
*
- * @param pOptions the p11tool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the p11tool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptLoad_Certificate(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1063,6 +1198,9 @@ doOptLoad_Certificate(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1070,24 +1208,24 @@ doOptLoad_Certificate(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the inraw option.
*
- * @param pOptions the p11tool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the p11tool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptInraw(tOptions* pOptions, tOptDesc* pOptDesc)
{
int res = optionAlias(pOptions, pOptDesc, INDEX_OPT_INDER);
if ((res != 0) && ((pOptions->fOptSet & OPTPROC_ERRSTOP) != 0))
- USAGE(P11TOOL_EXIT_FAILURE);
+ USAGE(P11TOOL_EXIT_USAGE_ERROR);
}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Code to handle the provider option.
- *
- * @param pOptions the p11tool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * This will override the default options in /etc/gnutls/pkcs11.conf
+ * @param[in] pOptions the p11tool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptProvider(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1100,9 +1238,12 @@ doOptProvider(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
-/* extracted from optmain.tlib near line 1113 */
+/* extracted from optmain.tlib near line 1254 */
/**
* The directory containing the data associated with p11tool.
@@ -1118,6 +1259,7 @@ doOptProvider(tOptions* pOptions, tOptDesc* pOptDesc)
#ifndef WITH_PACKAGER
# define p11tool_packager_info NULL
#else
+/** Packager information for p11tool. */
static char const p11tool_packager_info[] =
"Packaged by " WITH_PACKAGER
@@ -1173,42 +1315,69 @@ tOptions p11toolOptions = {
};
#if ENABLE_NLS
+/**
+ * This code is designed to translate translatable option text for the
+ * p11tool program. These translations happen upon entry
+ * to optionProcess().
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
#include <autoopts/usage-txt.h>
-static char* AO_gettext(char const* pz);
-static void coerce_it(void** s);
+static char * AO_gettext(char const * pz);
+static void coerce_it(void ** s);
/**
- * AutoGen specific wrapper function for gettext.
- * It relies on the macro _() to convert from English to the target
- * language, then strdup-duplicates the result string.
+ * AutoGen specific wrapper function for gettext. It relies on the macro _()
+ * to convert from English to the target language, then strdup-duplicates the
+ * result string. It tries the "libopts" domain first, then whatever has been
+ * set via the \a textdomain(3) call.
*
* @param[in] pz the input text used as a lookup key.
* @returns the translated text (if there is one),
* or the original text (if not).
*/
static char *
-AO_gettext(char const* pz)
+AO_gettext(char const * pz)
{
- char* pzRes;
+ char * res;
if (pz == NULL)
return NULL;
- pzRes = _(pz);
- if (pzRes == pz)
- return pzRes;
- pzRes = strdup(pzRes);
- if (pzRes == NULL) {
+#ifdef HAVE_DCGETTEXT
+ /*
+ * While processing the option_xlateable_txt data, try to use the
+ * "libopts" domain. Once we switch to the option descriptor data,
+ * do *not* use that domain.
+ */
+ if (option_xlateable_txt.field_ct != 0) {
+ res = dgettext("libopts", pz);
+ if (res == pz)
+ res = (char *)(void *)_(pz);
+ } else
+ res = (char *)(void *)_(pz);
+#else
+ res = (char *)(void *)_(pz);
+#endif
+ if (res == pz)
+ return res;
+ res = strdup(res);
+ if (res == NULL) {
fputs(_("No memory for duping translated strings\n"), stderr);
exit(P11TOOL_EXIT_FAILURE);
}
- return pzRes;
+ return res;
}
-static void coerce_it(void** s) { *s = AO_gettext(*s);
+/**
+ * All the pointers we use are marked "* const", but they are stored in
+ * writable memory. Coerce the mutability and set the pointer.
+ */
+static void coerce_it(void ** s) { *s = AO_gettext(*s);
}
/**
@@ -1218,56 +1387,498 @@ static void coerce_it(void** s) { *s = AO_gettext(*s);
static void
translate_option_strings(void)
{
- tOptions * const pOpt = &p11toolOptions;
+ tOptions * const opts = &p11toolOptions;
/*
* Guard against re-translation. It won't work. The strings will have
* been changed by the first pass through this code. One shot only.
*/
- if (option_usage_text.field_ct != 0) {
+ if (option_xlateable_txt.field_ct != 0) {
/*
* Do the translations. The first pointer follows the field count
* field. The field count field is the size of a pointer.
*/
- tOptDesc * pOD = pOpt->pOptDesc;
- char ** ppz = (char**)(void*)&(option_usage_text);
- int ix = option_usage_text.field_ct;
+ char ** ppz = (char**)(void*)&(option_xlateable_txt);
+ int ix = option_xlateable_txt.field_ct;
do {
- ppz++;
+ ppz++; /* skip over field_ct */
*ppz = AO_gettext(*ppz);
} while (--ix > 0);
-
- coerce_it((void*)&(pOpt->pzCopyright));
- coerce_it((void*)&(pOpt->pzCopyNotice));
- coerce_it((void*)&(pOpt->pzFullVersion));
- coerce_it((void*)&(pOpt->pzUsageTitle));
- coerce_it((void*)&(pOpt->pzExplain));
- coerce_it((void*)&(pOpt->pzDetail));
- coerce_it((void*)&(pOpt->pzPackager));
- coerce_it((void*)&(pOpt->pzShortUsage));
- option_usage_text.field_ct = 0;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++)
- coerce_it((void*)&(pOD->pzText));
- }
-
- if ((pOpt->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
- tOptDesc * pOD = pOpt->pOptDesc;
- int ix;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++) {
- coerce_it((void*)&(pOD->pz_Name));
- coerce_it((void*)&(pOD->pz_DisableName));
- coerce_it((void*)&(pOD->pz_DisablePfx));
+ /* prevent re-translation and disable "libopts" domain lookup */
+ option_xlateable_txt.field_ct = 0;
+
+ coerce_it((void*)&(opts->pzCopyright));
+ coerce_it((void*)&(opts->pzCopyNotice));
+ coerce_it((void*)&(opts->pzFullVersion));
+ 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));
}
- /* prevent re-translation */
- p11toolOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
}
-
#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 p11toolOptions structure noted in the comments below. The
+ literal text is defined in p11tool_opt_strs.
+
+ NOTE: the strings below are segmented with respect to the source string
+ p11tool_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 p11toolOptions.pzCopyright */
+ puts(_("p11tool @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 p11toolOptions.pzCopyNotice */
+ puts(_("p11tool 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(_("p11tool 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 p11toolOptions.pOptDesc->pzText */
+ puts(_("Enable debugging."));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Output file"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("List all available tokens"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Export the object specified by the URL"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("List all available mechanisms in a token"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("List all available objects in a token"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("List all available certificates in a token"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("List all certificates that have an associated private key"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("List all available private keys in a token"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("List all available certificates marked as trusted"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Initializes a PKCS #11 token"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Writes the loaded objects to a PKCS #11 token"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Deletes the objects matching the PKCS #11 URL"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Generate an RSA private-public key pair"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Generate an RSA private-public key pair"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Generate an RSA private-public key pair"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Sets a label for the write operation"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Marks the object to be written as trusted"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Marks the object to be written as private"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Force login to token"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Print detailed URLs"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Provide a hex encoded secret key"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Private key file to use"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Public key file to use"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Certificate file to use"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Use PKCS #8 format for private keys"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Specify the number of bits for key generate"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Specify the security level"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Use DER/RAW format for input"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("an alias for the 'inder' option"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("Specify the PKCS #11 provider library"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("display extended usage information and exit"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("extended usage information passed thru pager"));
+
+ /* referenced via p11toolOptions.pOptDesc->pzText */
+ puts(_("output version information and exit"));
+
+ /* referenced via p11toolOptions.pzUsageTitle */
+ puts(_("p11tool - GnuTLS PKCS #11 tool\n\
+Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [url]\n"));
+
+ /* referenced via p11toolOptions.pzExplain */
+ puts(_("\n"));
+
+ /* referenced via p11toolOptions.pzDetail */
+ puts(_("Program that allows handling data from PKCS #11 smart cards and security\n\
+modules.\n\n\
+To use PKCS #11 tokens with gnutls the configuration file\n\
+/etc/gnutls/pkcs11.conf has to exist and contain a number of lines of the\n\
+form 'load=/usr/lib/opensc-pkcs11.so'.\n"));
+
+ /* referenced via p11toolOptions.pzFullVersion */
+ puts(_("p11tool @VERSION@"));
+
+ /* referenced via p11toolOptions.pzFullUsage */
+ puts(_("<<<NOT-FOUND>>>"));
+
+ /* referenced via p11toolOptions.pzShortUsage */
+ puts(_("p11tool [options] [url]\n\
+p11tool --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/p11tool-args.h b/src/p11tool-args.h
index c60633ca3a..672e835eb8 100644
--- a/src/p11tool-args.h
+++ b/src/p11tool-args.h
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (p11tool-args.h)
- *
- * It has been AutoGen-ed November 28, 2012 at 11:45:35 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:16 PM by AutoGen 5.17.3
* From the definitions p11tool-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This header file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,24 +21,23 @@
*
* 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>
*
* p11tool 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.
- *
+ *
* p11tool 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 p11tool program.
* These macros are documented in the AutoGen info file in the
@@ -49,22 +48,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 147460
+#define AO_TEMPLATE_VERSION 155648
#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:
+/**
+ * Enumeration of each option type for p11tool
*/
typedef enum {
INDEX_OPT_DEBUG = 0,
@@ -102,44 +101,63 @@ typedef enum {
INDEX_OPT_HELP = 32,
INDEX_OPT_MORE_HELP = 33
} teOptIndex;
-
+/** count of all options for p11tool */
#define OPTION_CT 34
+/** p11tool version */
#define P11TOOL_VERSION "@VERSION@"
+/** Full p11tool version text */
#define P11TOOL_FULL_VERSION "p11tool @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) (p11toolOptions.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 p11tool exit codes
*/
typedef enum {
- P11TOOL_EXIT_SUCCESS = 0,
- P11TOOL_EXIT_FAILURE = 1,
- P11TOOL_EXIT_LIBOPTS_FAILURE = 70
+ P11TOOL_EXIT_SUCCESS = 0,
+ P11TOOL_EXIT_FAILURE = 1,
+ P11TOOL_EXIT_USAGE_ERROR = 64,
+ P11TOOL_EXIT_LIBOPTS_FAILURE = 70
} p11tool_exit_code_t;
-/* * * * * *
- *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/**
* Interface defines for specific options.
+ * @{
*/
#define VALUE_OPT_DEBUG 'd'
@@ -176,8 +194,11 @@ typedef enum {
#define VALUE_OPT_INDER 28
#define VALUE_OPT_INRAW 29
#define VALUE_OPT_PROVIDER 30
+/** 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
@@ -189,7 +210,7 @@ typedef enum {
p11toolOptions.pzCurOpt = NULL)
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*p11toolOptions.pUsageProc)(&p11toolOptions, c)
-/* extracted from opthead.tlib near line 484 */
+/* extracted from opthead.tlib near line 538 */
#ifdef __cplusplus
extern "C" {
@@ -209,6 +230,12 @@ extern tOptions p11toolOptions;
#if defined(ENABLE_NLS)
# ifndef _
# include <stdio.h>
+# ifndef HAVE_GETTEXT
+ extern char * gettext(char const *);
+# else
+# include <libintl.h>
+# endif
+
static inline char* aoGetsText(char const* pz) {
if (pz == NULL) return NULL;
return (char*)gettext(pz);
diff --git a/src/psk-args.c b/src/psk-args.c
index 35630e93a4..4ce99ae0a6 100644
--- a/src/psk-args.c
+++ b/src/psk-args.c
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (psk-args.c)
- *
- * It has been AutoGen-ed November 8, 2012 at 11:35:48 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:16 PM by AutoGen 5.17.3
* From the definitions psk-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This source file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,20 +21,19 @@
*
* 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>
*
* psktool 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.
- *
+ *
* psktool 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/>.
*/
@@ -53,28 +52,24 @@
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 (psktool_opt_strs+0)
-#define zLicenseDescrip (psktool_opt_strs+278)
+#define zLicenseDescrip (psktool_opt_strs+274)
#ifndef NULL
# define NULL 0
#endif
-/*
- * psktool option static const strings
+/**
+ * static const strings for psktool options
*/
-static char const psktool_opt_strs[1505] =
+static char const psktool_opt_strs[1482] =
/* 0 */ "psktool @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\n"
- "GNU General Public License, version 3 or later\n"
- " <http://gnu.org/licenses/gpl.html>\n\0"
-/* 278 */ "psktool is free software: you can redistribute it and/or modify it under\n"
+ "redistribution under the terms of the GNU General Public License,\n"
+ "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0"
+/* 274 */ "psktool 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"
@@ -84,80 +79,95 @@ static char const psktool_opt_strs[1505] =
"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"
-/* 881 */ "Enable debugging.\0"
-/* 899 */ "DEBUG\0"
-/* 905 */ "debug\0"
-/* 911 */ "specify the key size in bytes\0"
-/* 941 */ "KEYSIZE\0"
-/* 949 */ "keysize\0"
-/* 957 */ "specify a username\0"
-/* 976 */ "USERNAME\0"
-/* 985 */ "username\0"
-/* 994 */ "specify a password file.\0"
-/* 1019 */ "PASSWD\0"
-/* 1026 */ "passwd\0"
-/* 1033 */ "Display extended usage information and exit\0"
-/* 1077 */ "help\0"
-/* 1082 */ "Extended usage information passed thru pager\0"
-/* 1127 */ "more-help\0"
-/* 1137 */ "Output version information and exit\0"
-/* 1173 */ "version\0"
-/* 1181 */ "PSKTOOL\0"
-/* 1189 */ "psktool - GnuTLS PSK tool - Ver. @VERSION@\n"
- "USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
-/* 1290 */ "bug-gnutls@gnu.org\0"
-/* 1309 */ "\n\n\0"
-/* 1312 */ "\n"
- "Program that generates random keys for use with TLS-PSK. The keys are\n"
+/* 877 */ "Enable debugging.\0"
+/* 895 */ "DEBUG\0"
+/* 901 */ "debug\0"
+/* 907 */ "specify the key size in bytes\0"
+/* 937 */ "KEYSIZE\0"
+/* 945 */ "keysize\0"
+/* 953 */ "specify a username\0"
+/* 972 */ "USERNAME\0"
+/* 981 */ "username\0"
+/* 990 */ "specify a password file.\0"
+/* 1015 */ "PASSWD\0"
+/* 1022 */ "passwd\0"
+/* 1029 */ "display extended usage information and exit\0"
+/* 1073 */ "help\0"
+/* 1078 */ "extended usage information passed thru pager\0"
+/* 1123 */ "more-help\0"
+/* 1133 */ "output version information and exit\0"
+/* 1169 */ "version\0"
+/* 1177 */ "PSKTOOL\0"
+/* 1185 */ "psktool - GnuTLS PSK tool\n"
+ "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
+/* 1269 */ "bug-gnutls@gnu.org\0"
+/* 1288 */ "\n\0"
+/* 1290 */ "Program that generates random keys for use with TLS-PSK. The keys are\n"
"stored in hexadecimal format in a key file.\n\0"
-/* 1429 */ "psktool @VERSION@\0"
-/* 1447 */ "psktool [options]\n"
+/* 1406 */ "psktool @VERSION@\0"
+/* 1424 */ "psktool [options]\n"
"psktool --help for usage instructions.\n";
-/*
+/**
* debug option description:
*/
-#define DEBUG_DESC (psktool_opt_strs+881)
-#define DEBUG_NAME (psktool_opt_strs+899)
-#define DEBUG_name (psktool_opt_strs+905)
+/** Descriptive text for the debug option */
+#define DEBUG_DESC (psktool_opt_strs+877)
+/** Upper-cased name for the debug option */
+#define DEBUG_NAME (psktool_opt_strs+895)
+/** Name string for the debug option */
+#define DEBUG_name (psktool_opt_strs+901)
+/** Compiled in flag settings for the debug option */
#define DEBUG_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* keysize option description:
*/
-#define KEYSIZE_DESC (psktool_opt_strs+911)
-#define KEYSIZE_NAME (psktool_opt_strs+941)
-#define KEYSIZE_name (psktool_opt_strs+949)
+/** Descriptive text for the keysize option */
+#define KEYSIZE_DESC (psktool_opt_strs+907)
+/** Upper-cased name for the keysize option */
+#define KEYSIZE_NAME (psktool_opt_strs+937)
+/** Name string for the keysize option */
+#define KEYSIZE_name (psktool_opt_strs+945)
+/** Compiled in flag settings for the keysize option */
#define KEYSIZE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* username option description:
*/
-#define USERNAME_DESC (psktool_opt_strs+957)
-#define USERNAME_NAME (psktool_opt_strs+976)
-#define USERNAME_name (psktool_opt_strs+985)
+/** Descriptive text for the username option */
+#define USERNAME_DESC (psktool_opt_strs+953)
+/** Upper-cased name for the username option */
+#define USERNAME_NAME (psktool_opt_strs+972)
+/** Name string for the username option */
+#define USERNAME_name (psktool_opt_strs+981)
+/** Compiled in flag settings for the username option */
#define USERNAME_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* passwd option description:
*/
-#define PASSWD_DESC (psktool_opt_strs+994)
-#define PASSWD_NAME (psktool_opt_strs+1019)
-#define PASSWD_name (psktool_opt_strs+1026)
+/** Descriptive text for the passwd option */
+#define PASSWD_DESC (psktool_opt_strs+990)
+/** Upper-cased name for the passwd option */
+#define PASSWD_NAME (psktool_opt_strs+1015)
+/** Name string for the passwd option */
+#define PASSWD_name (psktool_opt_strs+1022)
+/** Compiled in flag settings for the passwd option */
#define PASSWD_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
/*
* Help/More_Help/Version option descriptions:
*/
-#define HELP_DESC (psktool_opt_strs+1033)
-#define HELP_name (psktool_opt_strs+1077)
+#define HELP_DESC (psktool_opt_strs+1029)
+#define HELP_name (psktool_opt_strs+1073)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (psktool_opt_strs+1082)
-#define MORE_HELP_name (psktool_opt_strs+1127)
+#define MORE_HELP_DESC (psktool_opt_strs+1078)
+#define MORE_HELP_name (psktool_opt_strs+1123)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC NULL
@@ -170,9 +180,9 @@ static char const psktool_opt_strs[1505] =
# define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
#endif
-#define VER_DESC (psktool_opt_strs+1137)
-#define VER_name (psktool_opt_strs+1173)
-/*
+#define VER_DESC (psktool_opt_strs+1133)
+#define VER_name (psktool_opt_strs+1169)
+/**
* Declare option callback procedures
*/
extern tOptProc
@@ -243,7 +253,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, 0,
+ /* opt state flags */ VER_FLAGS, AOUSE_VERSION,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -257,7 +267,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, 0,
+ /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -269,7 +279,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, 0,
+ /* opt state flags */ MORE_HELP_FLAGS, AOUSE_MORE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -279,19 +289,24 @@ static tOptDesc optDesc[OPTION_CT] = {
};
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Define the psktool Option Environment
- */
-#define zPROGNAME (psktool_opt_strs+1181)
-#define zUsageTitle (psktool_opt_strs+1189)
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/** Reference to the upper cased version of psktool. */
+#define zPROGNAME (psktool_opt_strs+1177)
+/** Reference to the title line for psktool usage. */
+#define zUsageTitle (psktool_opt_strs+1185)
+/** There is no psktool configuration file. */
#define zRcName NULL
+/** There are no directories to search for psktool config files. */
#define apzHomeList NULL
-#define zBugsAddr (psktool_opt_strs+1290)
-#define zExplain (psktool_opt_strs+1309)
-#define zDetail (psktool_opt_strs+1312)
-#define zFullVersion (psktool_opt_strs+1429)
-/* extracted from optcode.tlib near line 350 */
+/** The psktool program bug email address. */
+#define zBugsAddr (psktool_opt_strs+1269)
+/** Clarification/explanation of what psktool does. */
+#define zExplain (psktool_opt_strs+1288)
+/** Extra detail explaining what psktool does. */
+#define zDetail (psktool_opt_strs+1290)
+/** The full version string for psktool. */
+#define zFullVersion (psktool_opt_strs+1406)
+/* extracted from optcode.tlib near line 371 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT
@@ -301,10 +316,8 @@ static tOptDesc optDesc[OPTION_CT] = {
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
-
#define psktool_full_usage (NULL)
-
-#define psktool_short_usage (psktool_opt_strs+1447)
+#define psktool_short_usage (psktool_opt_strs+1424)
#endif /* not defined __doxygen__ */
@@ -314,8 +327,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/**
* The callout function that invokes the optionUsage function.
*
- * @param pOptions the AutoOpts option description structure
- * @param pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] pOptions the AutoOpts option description structure
+ * @param[in] pOptDesc the descriptor for the "help" (usage) option.
* @noreturn
*/
static void
@@ -330,9 +343,9 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Code to handle the debug option.
- *
- * @param pOptions the psktool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * Specifies the debug level.
+ * @param[in] pOptions the psktool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -358,8 +371,7 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
@@ -367,8 +379,8 @@ emit_ranges:
/**
* Code to handle the keysize option.
*
- * @param pOptions the psktool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the psktool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptKeysize(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -394,11 +406,10 @@ doOptKeysize(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
-/* extracted from optmain.tlib near line 1113 */
+/* extracted from optmain.tlib near line 1254 */
/**
* The directory containing the data associated with psktool.
@@ -414,6 +425,7 @@ emit_ranges:
#ifndef WITH_PACKAGER
# define psktool_packager_info NULL
#else
+/** Packager information for psktool. */
static char const psktool_packager_info[] =
"Packaged by " WITH_PACKAGER
@@ -468,42 +480,69 @@ tOptions psktoolOptions = {
};
#if ENABLE_NLS
+/**
+ * This code is designed to translate translatable option text for the
+ * psktool program. These translations happen upon entry
+ * to optionProcess().
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
#include <autoopts/usage-txt.h>
-static char* AO_gettext(char const* pz);
-static void coerce_it(void** s);
+static char * AO_gettext(char const * pz);
+static void coerce_it(void ** s);
/**
- * AutoGen specific wrapper function for gettext.
- * It relies on the macro _() to convert from English to the target
- * language, then strdup-duplicates the result string.
+ * AutoGen specific wrapper function for gettext. It relies on the macro _()
+ * to convert from English to the target language, then strdup-duplicates the
+ * result string. It tries the "libopts" domain first, then whatever has been
+ * set via the \a textdomain(3) call.
*
* @param[in] pz the input text used as a lookup key.
* @returns the translated text (if there is one),
* or the original text (if not).
*/
static char *
-AO_gettext(char const* pz)
+AO_gettext(char const * pz)
{
- char* pzRes;
+ char * res;
if (pz == NULL)
return NULL;
- pzRes = _(pz);
- if (pzRes == pz)
- return pzRes;
- pzRes = strdup(pzRes);
- if (pzRes == NULL) {
+#ifdef HAVE_DCGETTEXT
+ /*
+ * While processing the option_xlateable_txt data, try to use the
+ * "libopts" domain. Once we switch to the option descriptor data,
+ * do *not* use that domain.
+ */
+ if (option_xlateable_txt.field_ct != 0) {
+ res = dgettext("libopts", pz);
+ if (res == pz)
+ res = (char *)(void *)_(pz);
+ } else
+ res = (char *)(void *)_(pz);
+#else
+ res = (char *)(void *)_(pz);
+#endif
+ if (res == pz)
+ return res;
+ res = strdup(res);
+ if (res == NULL) {
fputs(_("No memory for duping translated strings\n"), stderr);
exit(PSKTOOL_EXIT_FAILURE);
}
- return pzRes;
+ return res;
}
-static void coerce_it(void** s) { *s = AO_gettext(*s);
+/**
+ * All the pointers we use are marked "* const", but they are stored in
+ * writable memory. Coerce the mutability and set the pointer.
+ */
+static void coerce_it(void ** s) { *s = AO_gettext(*s);
}
/**
@@ -513,56 +552,414 @@ static void coerce_it(void** s) { *s = AO_gettext(*s);
static void
translate_option_strings(void)
{
- tOptions * const pOpt = &psktoolOptions;
+ tOptions * const opts = &psktoolOptions;
/*
* Guard against re-translation. It won't work. The strings will have
* been changed by the first pass through this code. One shot only.
*/
- if (option_usage_text.field_ct != 0) {
+ if (option_xlateable_txt.field_ct != 0) {
/*
* Do the translations. The first pointer follows the field count
* field. The field count field is the size of a pointer.
*/
- tOptDesc * pOD = pOpt->pOptDesc;
- char ** ppz = (char**)(void*)&(option_usage_text);
- int ix = option_usage_text.field_ct;
+ char ** ppz = (char**)(void*)&(option_xlateable_txt);
+ int ix = option_xlateable_txt.field_ct;
do {
- ppz++;
+ ppz++; /* skip over field_ct */
*ppz = AO_gettext(*ppz);
} while (--ix > 0);
-
- coerce_it((void*)&(pOpt->pzCopyright));
- coerce_it((void*)&(pOpt->pzCopyNotice));
- coerce_it((void*)&(pOpt->pzFullVersion));
- coerce_it((void*)&(pOpt->pzUsageTitle));
- coerce_it((void*)&(pOpt->pzExplain));
- coerce_it((void*)&(pOpt->pzDetail));
- coerce_it((void*)&(pOpt->pzPackager));
- coerce_it((void*)&(pOpt->pzShortUsage));
- option_usage_text.field_ct = 0;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++)
- coerce_it((void*)&(pOD->pzText));
- }
-
- if ((pOpt->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
- tOptDesc * pOD = pOpt->pOptDesc;
- int ix;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++) {
- coerce_it((void*)&(pOD->pz_Name));
- coerce_it((void*)&(pOD->pz_DisableName));
- coerce_it((void*)&(pOD->pz_DisablePfx));
+ /* prevent re-translation and disable "libopts" domain lookup */
+ option_xlateable_txt.field_ct = 0;
+
+ coerce_it((void*)&(opts->pzCopyright));
+ coerce_it((void*)&(opts->pzCopyNotice));
+ coerce_it((void*)&(opts->pzFullVersion));
+ 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));
}
- /* prevent re-translation */
- psktoolOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
}
-
#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 psktoolOptions structure noted in the comments below. The
+ literal text is defined in psktool_opt_strs.
+
+ NOTE: the strings below are segmented with respect to the source string
+ psktool_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 psktoolOptions.pzCopyright */
+ puts(_("psktool @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 psktoolOptions.pzCopyNotice */
+ puts(_("psktool 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(_("psktool 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 psktoolOptions.pOptDesc->pzText */
+ puts(_("Enable debugging."));
+
+ /* referenced via psktoolOptions.pOptDesc->pzText */
+ puts(_("specify the key size in bytes"));
+
+ /* referenced via psktoolOptions.pOptDesc->pzText */
+ puts(_("specify a username"));
+
+ /* referenced via psktoolOptions.pOptDesc->pzText */
+ puts(_("specify a password file."));
+
+ /* referenced via psktoolOptions.pOptDesc->pzText */
+ puts(_("display extended usage information and exit"));
+
+ /* referenced via psktoolOptions.pOptDesc->pzText */
+ puts(_("extended usage information passed thru pager"));
+
+ /* referenced via psktoolOptions.pOptDesc->pzText */
+ puts(_("output version information and exit"));
+
+ /* referenced via psktoolOptions.pzUsageTitle */
+ puts(_("psktool - GnuTLS PSK tool\n\
+Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
+
+ /* referenced via psktoolOptions.pzExplain */
+ puts(_("\n"));
+
+ /* referenced via psktoolOptions.pzDetail */
+ puts(_("Program that generates random keys for use with TLS-PSK. The keys are\n\
+stored in hexadecimal format in a key file.\n"));
+
+ /* referenced via psktoolOptions.pzFullVersion */
+ puts(_("psktool @VERSION@"));
+
+ /* referenced via psktoolOptions.pzFullUsage */
+ puts(_("<<<NOT-FOUND>>>"));
+
+ /* referenced via psktoolOptions.pzShortUsage */
+ puts(_("psktool [options]\n\
+psktool --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/psk-args.h b/src/psk-args.h
index 1c01f70253..82086b8d62 100644
--- a/src/psk-args.h
+++ b/src/psk-args.h
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (psk-args.h)
- *
- * It has been AutoGen-ed November 8, 2012 at 11:35:48 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:16 PM by AutoGen 5.17.3
* From the definitions psk-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This header file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,24 +21,23 @@
*
* 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>
*
* psktool 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.
- *
+ *
* psktool 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 psktool program.
* These macros are documented in the AutoGen info file in the
@@ -49,22 +48,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 147460
+#define AO_TEMPLATE_VERSION 155648
#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:
+/**
+ * Enumeration of each option type for psktool
*/
typedef enum {
INDEX_OPT_DEBUG = 0,
@@ -75,44 +74,63 @@ typedef enum {
INDEX_OPT_HELP = 5,
INDEX_OPT_MORE_HELP = 6
} teOptIndex;
-
+/** count of all options for psktool */
#define OPTION_CT 7
+/** psktool version */
#define PSKTOOL_VERSION "@VERSION@"
+/** Full psktool version text */
#define PSKTOOL_FULL_VERSION "psktool @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) (psktoolOptions.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 psktool exit codes
*/
typedef enum {
- PSKTOOL_EXIT_SUCCESS = 0,
- PSKTOOL_EXIT_FAILURE = 1,
- PSKTOOL_EXIT_LIBOPTS_FAILURE = 70
+ PSKTOOL_EXIT_SUCCESS = 0,
+ PSKTOOL_EXIT_FAILURE = 1,
+ PSKTOOL_EXIT_USAGE_ERROR = 64,
+ PSKTOOL_EXIT_LIBOPTS_FAILURE = 70
} psktool_exit_code_t;
-/* * * * * *
- *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/**
* Interface defines for specific options.
+ * @{
*/
#define VALUE_OPT_DEBUG 'd'
@@ -122,8 +140,11 @@ typedef enum {
#define OPT_VALUE_KEYSIZE (DESC(KEYSIZE).optArg.argInt)
#define VALUE_OPT_USERNAME 'u'
#define VALUE_OPT_PASSWD 'p'
+/** 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
@@ -135,7 +156,7 @@ typedef enum {
psktoolOptions.pzCurOpt = NULL)
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*psktoolOptions.pUsageProc)(&psktoolOptions, c)
-/* extracted from opthead.tlib near line 484 */
+/* extracted from opthead.tlib near line 538 */
#ifdef __cplusplus
extern "C" {
@@ -155,6 +176,12 @@ extern tOptions psktoolOptions;
#if defined(ENABLE_NLS)
# ifndef _
# include <stdio.h>
+# ifndef HAVE_GETTEXT
+ extern char * gettext(char const *);
+# else
+# include <libintl.h>
+# endif
+
static inline char* aoGetsText(char const* pz) {
if (pz == NULL) return NULL;
return (char*)gettext(pz);
diff --git a/src/serv-args.c b/src/serv-args.c
index 61e4221664..dce96ac025 100644
--- a/src/serv-args.c
+++ b/src/serv-args.c
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (serv-args.c)
- *
- * It has been AutoGen-ed November 8, 2012 at 11:35:50 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:17 PM by AutoGen 5.17.3
* From the definitions serv-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This source file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,20 +21,19 @@
*
* 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>
*
* gnutls-serv 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.
- *
+ *
* gnutls-serv 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/>.
*/
@@ -53,28 +52,24 @@
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 (gnutls_serv_opt_strs+0)
-#define zLicenseDescrip (gnutls_serv_opt_strs+282)
+#define zLicenseDescrip (gnutls_serv_opt_strs+278)
#ifndef NULL
# define NULL 0
#endif
-/*
- * gnutls-serv option static const strings
+/**
+ * static const strings for gnutls-serv options
*/
-static char const gnutls_serv_opt_strs[3106] =
+static char const gnutls_serv_opt_strs[3083] =
/* 0 */ "gnutls-serv @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\n"
- "GNU General Public License, version 3 or later\n"
- " <http://gnu.org/licenses/gpl.html>\n\0"
-/* 282 */ "gnutls-serv is free software: you can redistribute it and/or modify it\n"
+ "redistribution under the terms of the GNU General Public License,\n"
+ "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0"
+/* 278 */ "gnutls-serv is free software: you can redistribute it and/or modify it\n"
"under 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"
@@ -84,437 +79,576 @@ static char const gnutls_serv_opt_strs[3106] =
"more 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"
-/* 893 */ "Enable debugging.\0"
-/* 911 */ "DEBUG\0"
-/* 917 */ "debug\0"
-/* 923 */ "Don't accept session tickets\0"
-/* 952 */ "NOTICKET\0"
-/* 961 */ "noticket\0"
-/* 970 */ "Generate Diffie-Hellman and RSA-export parameters\0"
-/* 1020 */ "GENERATE\0"
-/* 1029 */ "generate\0"
-/* 1038 */ "Suppress some messages\0"
-/* 1061 */ "QUIET\0"
-/* 1067 */ "quiet\0"
-/* 1073 */ "Do not use a resumption database\0"
-/* 1106 */ "NODB\0"
-/* 1111 */ "nodb\0"
-/* 1116 */ "Act as an HTTP server\0"
-/* 1138 */ "HTTP\0"
-/* 1143 */ "http\0"
-/* 1148 */ "Act as an Echo server\0"
-/* 1170 */ "ECHO\0"
-/* 1175 */ "echo\0"
-/* 1180 */ "Use DTLS (datagram TLS) over UDP\0"
-/* 1213 */ "UDP\0"
-/* 1217 */ "udp\0"
-/* 1221 */ "Set MTU for datagram TLS\0"
-/* 1246 */ "MTU\0"
-/* 1250 */ "mtu\0"
-/* 1254 */ "Offer SRTP profiles\0"
-/* 1274 */ "SRTP_PROFILES\0"
-/* 1288 */ "srtp-profiles\0"
-/* 1302 */ "Do not request a client certificate\0"
-/* 1338 */ "DISABLE_CLIENT_CERT\0"
-/* 1358 */ "disable-client-cert\0"
-/* 1378 */ "Require a client certificate\0"
-/* 1407 */ "REQUIRE_CLIENT_CERT\0"
-/* 1427 */ "require-client-cert\0"
-/* 1447 */ "Activate heartbeat support\0"
-/* 1474 */ "HEARTBEAT\0"
-/* 1484 */ "heartbeat\0"
-/* 1494 */ "Use DER format for certificates to read from\0"
-/* 1539 */ "X509FMTDER\0"
-/* 1550 */ "x509fmtder\0"
-/* 1561 */ "Priorities string\0"
-/* 1579 */ "PRIORITY\0"
-/* 1588 */ "priority\0"
-/* 1597 */ "DH params file to use\0"
-/* 1619 */ "DHPARAMS\0"
-/* 1628 */ "dhparams\0"
-/* 1637 */ "Certificate file or PKCS #11 URL to use\0"
-/* 1677 */ "X509CAFILE\0"
-/* 1688 */ "x509cafile\0"
-/* 1699 */ "CRL file to use\0"
-/* 1715 */ "X509CRLFILE\0"
-/* 1727 */ "x509crlfile\0"
-/* 1739 */ "PGP Key file to use\0"
-/* 1759 */ "PGPKEYFILE\0"
-/* 1770 */ "pgpkeyfile\0"
-/* 1781 */ "PGP Key ring file to use\0"
-/* 1806 */ "PGPKEYRING\0"
-/* 1817 */ "pgpkeyring\0"
-/* 1828 */ "PGP Public Key (certificate) file to use\0"
-/* 1869 */ "PGPCERTFILE\0"
-/* 1881 */ "pgpcertfile\0"
-/* 1893 */ "X.509 key file or PKCS #11 URL to use\0"
-/* 1931 */ "X509KEYFILE\0"
-/* 1943 */ "x509keyfile\0"
-/* 1955 */ "X.509 Certificate file or PKCS #11 URL to use\0"
-/* 2001 */ "X509CERTFILE\0"
-/* 2014 */ "x509certfile\0"
-/* 2027 */ "Alternative X.509 key file or PKCS #11 URL to use\0"
-/* 2077 */ "X509DSAKEYFILE\0"
-/* 2092 */ "x509dsakeyfile\0"
-/* 2107 */ "Alternative X.509 Certificate file or PKCS #11 URL to use\0"
-/* 2165 */ "X509DSACERTFILE\0"
-/* 2181 */ "x509dsacertfile\0"
-/* 2197 */ "X509ECCKEYFILE\0"
-/* 2212 */ "x509ecckeyfile\0"
-/* 2227 */ "X509ECCCERTFILE\0"
-/* 2243 */ "x509ecccertfile\0"
-/* 2259 */ "PGP subkey to use (hex or auto)\0"
-/* 2291 */ "PGPSUBKEY\0"
-/* 2301 */ "pgpsubkey\0"
-/* 2311 */ "SRP password file to use\0"
-/* 2336 */ "SRPPASSWD\0"
-/* 2346 */ "srppasswd\0"
-/* 2356 */ "SRP password configuration file to use\0"
-/* 2395 */ "SRPPASSWDCONF\0"
-/* 2409 */ "srppasswdconf\0"
-/* 2423 */ "PSK password file to use\0"
-/* 2448 */ "PSKPASSWD\0"
-/* 2458 */ "pskpasswd\0"
-/* 2468 */ "PSK identity hint to use\0"
-/* 2493 */ "PSKHINT\0"
-/* 2501 */ "pskhint\0"
-/* 2509 */ "The OCSP response to send to client\0"
-/* 2545 */ "OCSP_RESPONSE\0"
-/* 2559 */ "ocsp-response\0"
-/* 2573 */ "The port to connect to\0"
-/* 2596 */ "PORT\0"
-/* 2601 */ "port\0"
-/* 2606 */ "Print a list of the supported algorithms and modes\0"
-/* 2657 */ "LIST\0"
-/* 2662 */ "list\0"
-/* 2667 */ "Display extended usage information and exit\0"
-/* 2711 */ "help\0"
-/* 2716 */ "Extended usage information passed thru pager\0"
-/* 2761 */ "more-help\0"
-/* 2771 */ "Output version information and exit\0"
-/* 2807 */ "version\0"
-/* 2815 */ "GNUTLS_SERV\0"
-/* 2827 */ "gnutls-serv - GnuTLS server - Ver. @VERSION@\n"
- "USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
-/* 2930 */ "bug-gnutls@gnu.org\0"
-/* 2949 */ "\n\n\0"
-/* 2952 */ "\n"
- "Server program that listens to incoming TLS connections.\n\0"
-/* 3011 */ "gnutls-serv @VERSION@\0"
-/* 3033 */ "Usage: gnutls-serv [options]\n"
+/* 889 */ "Enable debugging.\0"
+/* 907 */ "DEBUG\0"
+/* 913 */ "debug\0"
+/* 919 */ "Don't accept session tickets\0"
+/* 948 */ "NOTICKET\0"
+/* 957 */ "noticket\0"
+/* 966 */ "Generate Diffie-Hellman and RSA-export parameters\0"
+/* 1016 */ "GENERATE\0"
+/* 1025 */ "generate\0"
+/* 1034 */ "Suppress some messages\0"
+/* 1057 */ "QUIET\0"
+/* 1063 */ "quiet\0"
+/* 1069 */ "Do not use a resumption database\0"
+/* 1102 */ "NODB\0"
+/* 1107 */ "nodb\0"
+/* 1112 */ "Act as an HTTP server\0"
+/* 1134 */ "HTTP\0"
+/* 1139 */ "http\0"
+/* 1144 */ "Act as an Echo server\0"
+/* 1166 */ "ECHO\0"
+/* 1171 */ "echo\0"
+/* 1176 */ "Use DTLS (datagram TLS) over UDP\0"
+/* 1209 */ "UDP\0"
+/* 1213 */ "udp\0"
+/* 1217 */ "Set MTU for datagram TLS\0"
+/* 1242 */ "MTU\0"
+/* 1246 */ "mtu\0"
+/* 1250 */ "Offer SRTP profiles\0"
+/* 1270 */ "SRTP_PROFILES\0"
+/* 1284 */ "srtp-profiles\0"
+/* 1298 */ "Do not request a client certificate\0"
+/* 1334 */ "DISABLE_CLIENT_CERT\0"
+/* 1354 */ "disable-client-cert\0"
+/* 1374 */ "Require a client certificate\0"
+/* 1403 */ "REQUIRE_CLIENT_CERT\0"
+/* 1423 */ "require-client-cert\0"
+/* 1443 */ "Activate heartbeat support\0"
+/* 1470 */ "HEARTBEAT\0"
+/* 1480 */ "heartbeat\0"
+/* 1490 */ "Use DER format for certificates to read from\0"
+/* 1535 */ "X509FMTDER\0"
+/* 1546 */ "x509fmtder\0"
+/* 1557 */ "Priorities string\0"
+/* 1575 */ "PRIORITY\0"
+/* 1584 */ "priority\0"
+/* 1593 */ "DH params file to use\0"
+/* 1615 */ "DHPARAMS\0"
+/* 1624 */ "dhparams\0"
+/* 1633 */ "Certificate file or PKCS #11 URL to use\0"
+/* 1673 */ "X509CAFILE\0"
+/* 1684 */ "x509cafile\0"
+/* 1695 */ "CRL file to use\0"
+/* 1711 */ "X509CRLFILE\0"
+/* 1723 */ "x509crlfile\0"
+/* 1735 */ "PGP Key file to use\0"
+/* 1755 */ "PGPKEYFILE\0"
+/* 1766 */ "pgpkeyfile\0"
+/* 1777 */ "PGP Key ring file to use\0"
+/* 1802 */ "PGPKEYRING\0"
+/* 1813 */ "pgpkeyring\0"
+/* 1824 */ "PGP Public Key (certificate) file to use\0"
+/* 1865 */ "PGPCERTFILE\0"
+/* 1877 */ "pgpcertfile\0"
+/* 1889 */ "X.509 key file or PKCS #11 URL to use\0"
+/* 1927 */ "X509KEYFILE\0"
+/* 1939 */ "x509keyfile\0"
+/* 1951 */ "X.509 Certificate file or PKCS #11 URL to use\0"
+/* 1997 */ "X509CERTFILE\0"
+/* 2010 */ "x509certfile\0"
+/* 2023 */ "Alternative X.509 key file or PKCS #11 URL to use\0"
+/* 2073 */ "X509DSAKEYFILE\0"
+/* 2088 */ "x509dsakeyfile\0"
+/* 2103 */ "Alternative X.509 Certificate file or PKCS #11 URL to use\0"
+/* 2161 */ "X509DSACERTFILE\0"
+/* 2177 */ "x509dsacertfile\0"
+/* 2193 */ "X509ECCKEYFILE\0"
+/* 2208 */ "x509ecckeyfile\0"
+/* 2223 */ "X509ECCCERTFILE\0"
+/* 2239 */ "x509ecccertfile\0"
+/* 2255 */ "PGP subkey to use (hex or auto)\0"
+/* 2287 */ "PGPSUBKEY\0"
+/* 2297 */ "pgpsubkey\0"
+/* 2307 */ "SRP password file to use\0"
+/* 2332 */ "SRPPASSWD\0"
+/* 2342 */ "srppasswd\0"
+/* 2352 */ "SRP password configuration file to use\0"
+/* 2391 */ "SRPPASSWDCONF\0"
+/* 2405 */ "srppasswdconf\0"
+/* 2419 */ "PSK password file to use\0"
+/* 2444 */ "PSKPASSWD\0"
+/* 2454 */ "pskpasswd\0"
+/* 2464 */ "PSK identity hint to use\0"
+/* 2489 */ "PSKHINT\0"
+/* 2497 */ "pskhint\0"
+/* 2505 */ "The OCSP response to send to client\0"
+/* 2541 */ "OCSP_RESPONSE\0"
+/* 2555 */ "ocsp-response\0"
+/* 2569 */ "The port to connect to\0"
+/* 2592 */ "PORT\0"
+/* 2597 */ "port\0"
+/* 2602 */ "Print a list of the supported algorithms and modes\0"
+/* 2653 */ "LIST\0"
+/* 2658 */ "list\0"
+/* 2663 */ "display extended usage information and exit\0"
+/* 2707 */ "help\0"
+/* 2712 */ "extended usage information passed thru pager\0"
+/* 2757 */ "more-help\0"
+/* 2767 */ "output version information and exit\0"
+/* 2803 */ "version\0"
+/* 2811 */ "GNUTLS_SERV\0"
+/* 2823 */ "gnutls-serv - GnuTLS server\n"
+ "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
+/* 2909 */ "bug-gnutls@gnu.org\0"
+/* 2928 */ "\n\0"
+/* 2930 */ "Server program that listens to incoming TLS connections.\n\0"
+/* 2988 */ "gnutls-serv @VERSION@\0"
+/* 3010 */ "Usage: gnutls-serv [options]\n"
"gnutls-serv --help for usage instructions.\n";
-/*
+/**
* debug option description:
*/
-#define DEBUG_DESC (gnutls_serv_opt_strs+893)
-#define DEBUG_NAME (gnutls_serv_opt_strs+911)
-#define DEBUG_name (gnutls_serv_opt_strs+917)
+/** Descriptive text for the debug option */
+#define DEBUG_DESC (gnutls_serv_opt_strs+889)
+/** Upper-cased name for the debug option */
+#define DEBUG_NAME (gnutls_serv_opt_strs+907)
+/** Name string for the debug option */
+#define DEBUG_name (gnutls_serv_opt_strs+913)
+/** Compiled in flag settings for the debug option */
#define DEBUG_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* noticket option description:
*/
-#define NOTICKET_DESC (gnutls_serv_opt_strs+923)
-#define NOTICKET_NAME (gnutls_serv_opt_strs+952)
-#define NOTICKET_name (gnutls_serv_opt_strs+961)
+/** Descriptive text for the noticket option */
+#define NOTICKET_DESC (gnutls_serv_opt_strs+919)
+/** Upper-cased name for the noticket option */
+#define NOTICKET_NAME (gnutls_serv_opt_strs+948)
+/** Name string for the noticket option */
+#define NOTICKET_name (gnutls_serv_opt_strs+957)
+/** Compiled in flag settings for the noticket option */
#define NOTICKET_FLAGS (OPTST_DISABLED)
-/*
+/**
* generate option description:
*/
-#define GENERATE_DESC (gnutls_serv_opt_strs+970)
-#define GENERATE_NAME (gnutls_serv_opt_strs+1020)
-#define GENERATE_name (gnutls_serv_opt_strs+1029)
+/** Descriptive text for the generate option */
+#define GENERATE_DESC (gnutls_serv_opt_strs+966)
+/** Upper-cased name for the generate option */
+#define GENERATE_NAME (gnutls_serv_opt_strs+1016)
+/** Name string for the generate option */
+#define GENERATE_name (gnutls_serv_opt_strs+1025)
+/** Compiled in flag settings for the generate option */
#define GENERATE_FLAGS (OPTST_DISABLED)
-/*
+/**
* quiet option description:
*/
-#define QUIET_DESC (gnutls_serv_opt_strs+1038)
-#define QUIET_NAME (gnutls_serv_opt_strs+1061)
-#define QUIET_name (gnutls_serv_opt_strs+1067)
+/** Descriptive text for the quiet option */
+#define QUIET_DESC (gnutls_serv_opt_strs+1034)
+/** Upper-cased name for the quiet option */
+#define QUIET_NAME (gnutls_serv_opt_strs+1057)
+/** Name string for the quiet option */
+#define QUIET_name (gnutls_serv_opt_strs+1063)
+/** Compiled in flag settings for the quiet option */
#define QUIET_FLAGS (OPTST_DISABLED)
-/*
+/**
* nodb option description:
*/
-#define NODB_DESC (gnutls_serv_opt_strs+1073)
-#define NODB_NAME (gnutls_serv_opt_strs+1106)
-#define NODB_name (gnutls_serv_opt_strs+1111)
+/** Descriptive text for the nodb option */
+#define NODB_DESC (gnutls_serv_opt_strs+1069)
+/** Upper-cased name for the nodb option */
+#define NODB_NAME (gnutls_serv_opt_strs+1102)
+/** Name string for the nodb option */
+#define NODB_name (gnutls_serv_opt_strs+1107)
+/** Compiled in flag settings for the nodb option */
#define NODB_FLAGS (OPTST_DISABLED)
-/*
+/**
* http option description:
*/
-#define HTTP_DESC (gnutls_serv_opt_strs+1116)
-#define HTTP_NAME (gnutls_serv_opt_strs+1138)
-#define HTTP_name (gnutls_serv_opt_strs+1143)
+/** Descriptive text for the http option */
+#define HTTP_DESC (gnutls_serv_opt_strs+1112)
+/** Upper-cased name for the http option */
+#define HTTP_NAME (gnutls_serv_opt_strs+1134)
+/** Name string for the http option */
+#define HTTP_name (gnutls_serv_opt_strs+1139)
+/** Compiled in flag settings for the http option */
#define HTTP_FLAGS (OPTST_DISABLED)
-/*
+/**
* echo option description:
*/
-#define ECHO_DESC (gnutls_serv_opt_strs+1148)
-#define ECHO_NAME (gnutls_serv_opt_strs+1170)
-#define ECHO_name (gnutls_serv_opt_strs+1175)
+/** Descriptive text for the echo option */
+#define ECHO_DESC (gnutls_serv_opt_strs+1144)
+/** Upper-cased name for the echo option */
+#define ECHO_NAME (gnutls_serv_opt_strs+1166)
+/** Name string for the echo option */
+#define ECHO_name (gnutls_serv_opt_strs+1171)
+/** Compiled in flag settings for the echo option */
#define ECHO_FLAGS (OPTST_DISABLED)
-/*
+/**
* udp option description:
*/
-#define UDP_DESC (gnutls_serv_opt_strs+1180)
-#define UDP_NAME (gnutls_serv_opt_strs+1213)
-#define UDP_name (gnutls_serv_opt_strs+1217)
+/** Descriptive text for the udp option */
+#define UDP_DESC (gnutls_serv_opt_strs+1176)
+/** Upper-cased name for the udp option */
+#define UDP_NAME (gnutls_serv_opt_strs+1209)
+/** Name string for the udp option */
+#define UDP_name (gnutls_serv_opt_strs+1213)
+/** Compiled in flag settings for the udp option */
#define UDP_FLAGS (OPTST_DISABLED)
-/*
+/**
* mtu option description:
*/
-#define MTU_DESC (gnutls_serv_opt_strs+1221)
-#define MTU_NAME (gnutls_serv_opt_strs+1246)
-#define MTU_name (gnutls_serv_opt_strs+1250)
+/** Descriptive text for the mtu option */
+#define MTU_DESC (gnutls_serv_opt_strs+1217)
+/** Upper-cased name for the mtu option */
+#define MTU_NAME (gnutls_serv_opt_strs+1242)
+/** Name string for the mtu option */
+#define MTU_name (gnutls_serv_opt_strs+1246)
+/** Compiled in flag settings for the mtu option */
#define MTU_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* srtp_profiles option description:
*/
-#define SRTP_PROFILES_DESC (gnutls_serv_opt_strs+1254)
-#define SRTP_PROFILES_NAME (gnutls_serv_opt_strs+1274)
-#define SRTP_PROFILES_name (gnutls_serv_opt_strs+1288)
+/** Descriptive text for the srtp_profiles option */
+#define SRTP_PROFILES_DESC (gnutls_serv_opt_strs+1250)
+/** Upper-cased name for the srtp_profiles option */
+#define SRTP_PROFILES_NAME (gnutls_serv_opt_strs+1270)
+/** Name string for the srtp_profiles option */
+#define SRTP_PROFILES_name (gnutls_serv_opt_strs+1284)
+/** Compiled in flag settings for the srtp_profiles option */
#define SRTP_PROFILES_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* disable-client-cert option description:
*/
-#define DISABLE_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1302)
-#define DISABLE_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1338)
-#define DISABLE_CLIENT_CERT_name (gnutls_serv_opt_strs+1358)
+/** Descriptive text for the disable-client-cert option */
+#define DISABLE_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1298)
+/** Upper-cased name for the disable-client-cert option */
+#define DISABLE_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1334)
+/** Name string for the disable-client-cert option */
+#define DISABLE_CLIENT_CERT_name (gnutls_serv_opt_strs+1354)
+/** Compiled in flag settings for the disable-client-cert option */
#define DISABLE_CLIENT_CERT_FLAGS (OPTST_DISABLED)
-/*
+/**
* require-client-cert option description:
*/
-#define REQUIRE_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1378)
-#define REQUIRE_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1407)
-#define REQUIRE_CLIENT_CERT_name (gnutls_serv_opt_strs+1427)
+/** Descriptive text for the require-client-cert option */
+#define REQUIRE_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1374)
+/** Upper-cased name for the require-client-cert option */
+#define REQUIRE_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1403)
+/** Name string for the require-client-cert option */
+#define REQUIRE_CLIENT_CERT_name (gnutls_serv_opt_strs+1423)
+/** Compiled in flag settings for the require-client-cert option */
#define REQUIRE_CLIENT_CERT_FLAGS (OPTST_DISABLED)
-/*
+/**
* heartbeat option description:
*/
-#define HEARTBEAT_DESC (gnutls_serv_opt_strs+1447)
-#define HEARTBEAT_NAME (gnutls_serv_opt_strs+1474)
-#define HEARTBEAT_name (gnutls_serv_opt_strs+1484)
+/** Descriptive text for the heartbeat option */
+#define HEARTBEAT_DESC (gnutls_serv_opt_strs+1443)
+/** Upper-cased name for the heartbeat option */
+#define HEARTBEAT_NAME (gnutls_serv_opt_strs+1470)
+/** Name string for the heartbeat option */
+#define HEARTBEAT_name (gnutls_serv_opt_strs+1480)
+/** Compiled in flag settings for the heartbeat option */
#define HEARTBEAT_FLAGS (OPTST_DISABLED)
-/*
+/**
* x509fmtder option description:
*/
-#define X509FMTDER_DESC (gnutls_serv_opt_strs+1494)
-#define X509FMTDER_NAME (gnutls_serv_opt_strs+1539)
-#define X509FMTDER_name (gnutls_serv_opt_strs+1550)
+/** Descriptive text for the x509fmtder option */
+#define X509FMTDER_DESC (gnutls_serv_opt_strs+1490)
+/** Upper-cased name for the x509fmtder option */
+#define X509FMTDER_NAME (gnutls_serv_opt_strs+1535)
+/** Name string for the x509fmtder option */
+#define X509FMTDER_name (gnutls_serv_opt_strs+1546)
+/** Compiled in flag settings for the x509fmtder option */
#define X509FMTDER_FLAGS (OPTST_DISABLED)
-/*
+/**
* priority option description:
*/
-#define PRIORITY_DESC (gnutls_serv_opt_strs+1561)
-#define PRIORITY_NAME (gnutls_serv_opt_strs+1579)
-#define PRIORITY_name (gnutls_serv_opt_strs+1588)
+/** Descriptive text for the priority option */
+#define PRIORITY_DESC (gnutls_serv_opt_strs+1557)
+/** Upper-cased name for the priority option */
+#define PRIORITY_NAME (gnutls_serv_opt_strs+1575)
+/** Name string for the priority option */
+#define PRIORITY_name (gnutls_serv_opt_strs+1584)
+/** Compiled in flag settings for the priority option */
#define PRIORITY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* dhparams option description:
*/
-#define DHPARAMS_DESC (gnutls_serv_opt_strs+1597)
-#define DHPARAMS_NAME (gnutls_serv_opt_strs+1619)
-#define DHPARAMS_name (gnutls_serv_opt_strs+1628)
+/** Descriptive text for the dhparams option */
+#define DHPARAMS_DESC (gnutls_serv_opt_strs+1593)
+/** Upper-cased name for the dhparams option */
+#define DHPARAMS_NAME (gnutls_serv_opt_strs+1615)
+/** Name string for the dhparams option */
+#define DHPARAMS_name (gnutls_serv_opt_strs+1624)
+/** Compiled in flag settings for the dhparams option */
#define DHPARAMS_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* x509cafile option description:
*/
-#define X509CAFILE_DESC (gnutls_serv_opt_strs+1637)
-#define X509CAFILE_NAME (gnutls_serv_opt_strs+1677)
-#define X509CAFILE_name (gnutls_serv_opt_strs+1688)
+/** Descriptive text for the x509cafile option */
+#define X509CAFILE_DESC (gnutls_serv_opt_strs+1633)
+/** Upper-cased name for the x509cafile option */
+#define X509CAFILE_NAME (gnutls_serv_opt_strs+1673)
+/** Name string for the x509cafile option */
+#define X509CAFILE_name (gnutls_serv_opt_strs+1684)
+/** Compiled in flag settings for the x509cafile option */
#define X509CAFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* x509crlfile option description:
*/
-#define X509CRLFILE_DESC (gnutls_serv_opt_strs+1699)
-#define X509CRLFILE_NAME (gnutls_serv_opt_strs+1715)
-#define X509CRLFILE_name (gnutls_serv_opt_strs+1727)
+/** Descriptive text for the x509crlfile option */
+#define X509CRLFILE_DESC (gnutls_serv_opt_strs+1695)
+/** Upper-cased name for the x509crlfile option */
+#define X509CRLFILE_NAME (gnutls_serv_opt_strs+1711)
+/** Name string for the x509crlfile option */
+#define X509CRLFILE_name (gnutls_serv_opt_strs+1723)
+/** Compiled in flag settings for the x509crlfile option */
#define X509CRLFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* pgpkeyfile option description:
*/
-#define PGPKEYFILE_DESC (gnutls_serv_opt_strs+1739)
-#define PGPKEYFILE_NAME (gnutls_serv_opt_strs+1759)
-#define PGPKEYFILE_name (gnutls_serv_opt_strs+1770)
+/** Descriptive text for the pgpkeyfile option */
+#define PGPKEYFILE_DESC (gnutls_serv_opt_strs+1735)
+/** Upper-cased name for the pgpkeyfile option */
+#define PGPKEYFILE_NAME (gnutls_serv_opt_strs+1755)
+/** Name string for the pgpkeyfile option */
+#define PGPKEYFILE_name (gnutls_serv_opt_strs+1766)
+/** Compiled in flag settings for the pgpkeyfile option */
#define PGPKEYFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* pgpkeyring option description:
*/
-#define PGPKEYRING_DESC (gnutls_serv_opt_strs+1781)
-#define PGPKEYRING_NAME (gnutls_serv_opt_strs+1806)
-#define PGPKEYRING_name (gnutls_serv_opt_strs+1817)
+/** Descriptive text for the pgpkeyring option */
+#define PGPKEYRING_DESC (gnutls_serv_opt_strs+1777)
+/** Upper-cased name for the pgpkeyring option */
+#define PGPKEYRING_NAME (gnutls_serv_opt_strs+1802)
+/** Name string for the pgpkeyring option */
+#define PGPKEYRING_name (gnutls_serv_opt_strs+1813)
+/** Compiled in flag settings for the pgpkeyring option */
#define PGPKEYRING_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* pgpcertfile option description:
*/
-#define PGPCERTFILE_DESC (gnutls_serv_opt_strs+1828)
-#define PGPCERTFILE_NAME (gnutls_serv_opt_strs+1869)
-#define PGPCERTFILE_name (gnutls_serv_opt_strs+1881)
+/** Descriptive text for the pgpcertfile option */
+#define PGPCERTFILE_DESC (gnutls_serv_opt_strs+1824)
+/** Upper-cased name for the pgpcertfile option */
+#define PGPCERTFILE_NAME (gnutls_serv_opt_strs+1865)
+/** Name string for the pgpcertfile option */
+#define PGPCERTFILE_name (gnutls_serv_opt_strs+1877)
+/** Compiled in flag settings for the pgpcertfile option */
#define PGPCERTFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* x509keyfile option description:
*/
-#define X509KEYFILE_DESC (gnutls_serv_opt_strs+1893)
-#define X509KEYFILE_NAME (gnutls_serv_opt_strs+1931)
-#define X509KEYFILE_name (gnutls_serv_opt_strs+1943)
+/** Descriptive text for the x509keyfile option */
+#define X509KEYFILE_DESC (gnutls_serv_opt_strs+1889)
+/** Upper-cased name for the x509keyfile option */
+#define X509KEYFILE_NAME (gnutls_serv_opt_strs+1927)
+/** Name string for the x509keyfile option */
+#define X509KEYFILE_name (gnutls_serv_opt_strs+1939)
+/** Compiled in flag settings for the x509keyfile option */
#define X509KEYFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* x509certfile option description:
*/
-#define X509CERTFILE_DESC (gnutls_serv_opt_strs+1955)
-#define X509CERTFILE_NAME (gnutls_serv_opt_strs+2001)
-#define X509CERTFILE_name (gnutls_serv_opt_strs+2014)
+/** Descriptive text for the x509certfile option */
+#define X509CERTFILE_DESC (gnutls_serv_opt_strs+1951)
+/** Upper-cased name for the x509certfile option */
+#define X509CERTFILE_NAME (gnutls_serv_opt_strs+1997)
+/** Name string for the x509certfile option */
+#define X509CERTFILE_name (gnutls_serv_opt_strs+2010)
+/** Compiled in flag settings for the x509certfile option */
#define X509CERTFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* x509dsakeyfile option description:
*/
-#define X509DSAKEYFILE_DESC (gnutls_serv_opt_strs+2027)
-#define X509DSAKEYFILE_NAME (gnutls_serv_opt_strs+2077)
-#define X509DSAKEYFILE_name (gnutls_serv_opt_strs+2092)
+/** Descriptive text for the x509dsakeyfile option */
+#define X509DSAKEYFILE_DESC (gnutls_serv_opt_strs+2023)
+/** Upper-cased name for the x509dsakeyfile option */
+#define X509DSAKEYFILE_NAME (gnutls_serv_opt_strs+2073)
+/** Name string for the x509dsakeyfile option */
+#define X509DSAKEYFILE_name (gnutls_serv_opt_strs+2088)
+/** Compiled in flag settings for the x509dsakeyfile option */
#define X509DSAKEYFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* x509dsacertfile option description:
*/
-#define X509DSACERTFILE_DESC (gnutls_serv_opt_strs+2107)
-#define X509DSACERTFILE_NAME (gnutls_serv_opt_strs+2165)
-#define X509DSACERTFILE_name (gnutls_serv_opt_strs+2181)
+/** Descriptive text for the x509dsacertfile option */
+#define X509DSACERTFILE_DESC (gnutls_serv_opt_strs+2103)
+/** Upper-cased name for the x509dsacertfile option */
+#define X509DSACERTFILE_NAME (gnutls_serv_opt_strs+2161)
+/** Name string for the x509dsacertfile option */
+#define X509DSACERTFILE_name (gnutls_serv_opt_strs+2177)
+/** Compiled in flag settings for the x509dsacertfile option */
#define X509DSACERTFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* x509ecckeyfile option description:
*/
-#define X509ECCKEYFILE_DESC (gnutls_serv_opt_strs+2027)
-#define X509ECCKEYFILE_NAME (gnutls_serv_opt_strs+2197)
-#define X509ECCKEYFILE_name (gnutls_serv_opt_strs+2212)
+/** Descriptive text for the x509ecckeyfile option */
+#define X509ECCKEYFILE_DESC (gnutls_serv_opt_strs+2023)
+/** Upper-cased name for the x509ecckeyfile option */
+#define X509ECCKEYFILE_NAME (gnutls_serv_opt_strs+2193)
+/** Name string for the x509ecckeyfile option */
+#define X509ECCKEYFILE_name (gnutls_serv_opt_strs+2208)
+/** Compiled in flag settings for the x509ecckeyfile option */
#define X509ECCKEYFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* x509ecccertfile option description:
*/
-#define X509ECCCERTFILE_DESC (gnutls_serv_opt_strs+2107)
-#define X509ECCCERTFILE_NAME (gnutls_serv_opt_strs+2227)
-#define X509ECCCERTFILE_name (gnutls_serv_opt_strs+2243)
+/** Descriptive text for the x509ecccertfile option */
+#define X509ECCCERTFILE_DESC (gnutls_serv_opt_strs+2103)
+/** Upper-cased name for the x509ecccertfile option */
+#define X509ECCCERTFILE_NAME (gnutls_serv_opt_strs+2223)
+/** Name string for the x509ecccertfile option */
+#define X509ECCCERTFILE_name (gnutls_serv_opt_strs+2239)
+/** Compiled in flag settings for the x509ecccertfile option */
#define X509ECCCERTFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* pgpsubkey option description:
*/
-#define PGPSUBKEY_DESC (gnutls_serv_opt_strs+2259)
-#define PGPSUBKEY_NAME (gnutls_serv_opt_strs+2291)
-#define PGPSUBKEY_name (gnutls_serv_opt_strs+2301)
+/** Descriptive text for the pgpsubkey option */
+#define PGPSUBKEY_DESC (gnutls_serv_opt_strs+2255)
+/** Upper-cased name for the pgpsubkey option */
+#define PGPSUBKEY_NAME (gnutls_serv_opt_strs+2287)
+/** Name string for the pgpsubkey option */
+#define PGPSUBKEY_name (gnutls_serv_opt_strs+2297)
+/** Compiled in flag settings for the pgpsubkey option */
#define PGPSUBKEY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* srppasswd option description:
*/
-#define SRPPASSWD_DESC (gnutls_serv_opt_strs+2311)
-#define SRPPASSWD_NAME (gnutls_serv_opt_strs+2336)
-#define SRPPASSWD_name (gnutls_serv_opt_strs+2346)
+/** Descriptive text for the srppasswd option */
+#define SRPPASSWD_DESC (gnutls_serv_opt_strs+2307)
+/** Upper-cased name for the srppasswd option */
+#define SRPPASSWD_NAME (gnutls_serv_opt_strs+2332)
+/** Name string for the srppasswd option */
+#define SRPPASSWD_name (gnutls_serv_opt_strs+2342)
+/** Compiled in flag settings for the srppasswd option */
#define SRPPASSWD_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* srppasswdconf option description:
*/
-#define SRPPASSWDCONF_DESC (gnutls_serv_opt_strs+2356)
-#define SRPPASSWDCONF_NAME (gnutls_serv_opt_strs+2395)
-#define SRPPASSWDCONF_name (gnutls_serv_opt_strs+2409)
+/** Descriptive text for the srppasswdconf option */
+#define SRPPASSWDCONF_DESC (gnutls_serv_opt_strs+2352)
+/** Upper-cased name for the srppasswdconf option */
+#define SRPPASSWDCONF_NAME (gnutls_serv_opt_strs+2391)
+/** Name string for the srppasswdconf option */
+#define SRPPASSWDCONF_name (gnutls_serv_opt_strs+2405)
+/** Compiled in flag settings for the srppasswdconf option */
#define SRPPASSWDCONF_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* pskpasswd option description:
*/
-#define PSKPASSWD_DESC (gnutls_serv_opt_strs+2423)
-#define PSKPASSWD_NAME (gnutls_serv_opt_strs+2448)
-#define PSKPASSWD_name (gnutls_serv_opt_strs+2458)
+/** Descriptive text for the pskpasswd option */
+#define PSKPASSWD_DESC (gnutls_serv_opt_strs+2419)
+/** Upper-cased name for the pskpasswd option */
+#define PSKPASSWD_NAME (gnutls_serv_opt_strs+2444)
+/** Name string for the pskpasswd option */
+#define PSKPASSWD_name (gnutls_serv_opt_strs+2454)
+/** Compiled in flag settings for the pskpasswd option */
#define PSKPASSWD_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* pskhint option description:
*/
-#define PSKHINT_DESC (gnutls_serv_opt_strs+2468)
-#define PSKHINT_NAME (gnutls_serv_opt_strs+2493)
-#define PSKHINT_name (gnutls_serv_opt_strs+2501)
+/** Descriptive text for the pskhint option */
+#define PSKHINT_DESC (gnutls_serv_opt_strs+2464)
+/** Upper-cased name for the pskhint option */
+#define PSKHINT_NAME (gnutls_serv_opt_strs+2489)
+/** Name string for the pskhint option */
+#define PSKHINT_name (gnutls_serv_opt_strs+2497)
+/** Compiled in flag settings for the pskhint option */
#define PSKHINT_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* ocsp-response option description:
*/
-#define OCSP_RESPONSE_DESC (gnutls_serv_opt_strs+2509)
-#define OCSP_RESPONSE_NAME (gnutls_serv_opt_strs+2545)
-#define OCSP_RESPONSE_name (gnutls_serv_opt_strs+2559)
+/** Descriptive text for the ocsp-response option */
+#define OCSP_RESPONSE_DESC (gnutls_serv_opt_strs+2505)
+/** Upper-cased name for the ocsp-response option */
+#define OCSP_RESPONSE_NAME (gnutls_serv_opt_strs+2541)
+/** Name string for the ocsp-response option */
+#define OCSP_RESPONSE_name (gnutls_serv_opt_strs+2555)
+/** Compiled in flag settings for the ocsp-response option */
#define OCSP_RESPONSE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
-/*
+/**
* port option description:
*/
-#define PORT_DESC (gnutls_serv_opt_strs+2573)
-#define PORT_NAME (gnutls_serv_opt_strs+2596)
-#define PORT_name (gnutls_serv_opt_strs+2601)
+/** Descriptive text for the port option */
+#define PORT_DESC (gnutls_serv_opt_strs+2569)
+/** Upper-cased name for the port option */
+#define PORT_NAME (gnutls_serv_opt_strs+2592)
+/** Name string for the port option */
+#define PORT_name (gnutls_serv_opt_strs+2597)
+/** Compiled in flag settings for the port option */
#define PORT_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* list option description:
*/
-#define LIST_DESC (gnutls_serv_opt_strs+2606)
-#define LIST_NAME (gnutls_serv_opt_strs+2657)
-#define LIST_name (gnutls_serv_opt_strs+2662)
+/** Descriptive text for the list option */
+#define LIST_DESC (gnutls_serv_opt_strs+2602)
+/** Upper-cased name for the list option */
+#define LIST_NAME (gnutls_serv_opt_strs+2653)
+/** Name string for the list option */
+#define LIST_name (gnutls_serv_opt_strs+2658)
+/** Compiled in flag settings for the list option */
#define LIST_FLAGS (OPTST_DISABLED)
/*
* Help/More_Help/Version option descriptions:
*/
-#define HELP_DESC (gnutls_serv_opt_strs+2667)
-#define HELP_name (gnutls_serv_opt_strs+2711)
+#define HELP_DESC (gnutls_serv_opt_strs+2663)
+#define HELP_name (gnutls_serv_opt_strs+2707)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (gnutls_serv_opt_strs+2716)
-#define MORE_HELP_name (gnutls_serv_opt_strs+2761)
+#define MORE_HELP_DESC (gnutls_serv_opt_strs+2712)
+#define MORE_HELP_name (gnutls_serv_opt_strs+2757)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC NULL
@@ -527,9 +661,9 @@ static char const gnutls_serv_opt_strs[3106] =
# define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
#endif
-#define VER_DESC (gnutls_serv_opt_strs+2771)
-#define VER_name (gnutls_serv_opt_strs+2807)
-/*
+#define VER_DESC (gnutls_serv_opt_strs+2767)
+#define VER_name (gnutls_serv_opt_strs+2803)
+/**
* Declare option callback procedures
*/
extern tOptProc
@@ -975,7 +1109,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, 0,
+ /* opt state flags */ VER_FLAGS, AOUSE_VERSION,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -989,7 +1123,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, 0,
+ /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -1001,7 +1135,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, 0,
+ /* opt state flags */ MORE_HELP_FLAGS, AOUSE_MORE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -1011,19 +1145,24 @@ static tOptDesc optDesc[OPTION_CT] = {
};
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Define the gnutls-serv Option Environment
- */
-#define zPROGNAME (gnutls_serv_opt_strs+2815)
-#define zUsageTitle (gnutls_serv_opt_strs+2827)
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/** Reference to the upper cased version of gnutls-serv. */
+#define zPROGNAME (gnutls_serv_opt_strs+2811)
+/** Reference to the title line for gnutls-serv usage. */
+#define zUsageTitle (gnutls_serv_opt_strs+2823)
+/** There is no gnutls-serv configuration file. */
#define zRcName NULL
+/** There are no directories to search for gnutls-serv config files. */
#define apzHomeList NULL
-#define zBugsAddr (gnutls_serv_opt_strs+2930)
-#define zExplain (gnutls_serv_opt_strs+2949)
-#define zDetail (gnutls_serv_opt_strs+2952)
-#define zFullVersion (gnutls_serv_opt_strs+3011)
-/* extracted from optcode.tlib near line 350 */
+/** The gnutls-serv program bug email address. */
+#define zBugsAddr (gnutls_serv_opt_strs+2909)
+/** Clarification/explanation of what gnutls-serv does. */
+#define zExplain (gnutls_serv_opt_strs+2928)
+/** Extra detail explaining what gnutls-serv does. */
+#define zDetail (gnutls_serv_opt_strs+2930)
+/** The full version string for gnutls-serv. */
+#define zFullVersion (gnutls_serv_opt_strs+2988)
+/* extracted from optcode.tlib near line 371 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT
@@ -1033,10 +1172,8 @@ static tOptDesc optDesc[OPTION_CT] = {
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
-
#define gnutls_serv_full_usage (NULL)
-
-#define gnutls_serv_short_usage (gnutls_serv_opt_strs+3033)
+#define gnutls_serv_short_usage (gnutls_serv_opt_strs+3010)
#endif /* not defined __doxygen__ */
@@ -1046,8 +1183,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/**
* The callout function that invokes the optionUsage function.
*
- * @param pOptions the AutoOpts option description structure
- * @param pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] pOptions the AutoOpts option description structure
+ * @param[in] pOptDesc the descriptor for the "help" (usage) option.
* @noreturn
*/
static void
@@ -1062,9 +1199,9 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Code to handle the debug option.
- *
- * @param pOptions the gnutls-serv options data structure
- * @param pOptDesc the option descriptor for this option.
+ * Specifies the debug level.
+ * @param[in] pOptions the gnutls-serv options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1090,8 +1227,7 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
@@ -1099,8 +1235,8 @@ emit_ranges:
/**
* Code to handle the mtu option.
*
- * @param pOptions the gnutls-serv options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-serv options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptMtu(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1126,8 +1262,7 @@ doOptMtu(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
@@ -1135,8 +1270,8 @@ emit_ranges:
/**
* Code to handle the dhparams option.
*
- * @param pOptions the gnutls-serv options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-serv options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptDhparams(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1149,6 +1284,9 @@ doOptDhparams(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1156,8 +1294,8 @@ doOptDhparams(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the x509crlfile option.
*
- * @param pOptions the gnutls-serv options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-serv options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptX509crlfile(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1170,6 +1308,9 @@ doOptX509crlfile(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1177,8 +1318,8 @@ doOptX509crlfile(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the pgpkeyfile option.
*
- * @param pOptions the gnutls-serv options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-serv options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptPgpkeyfile(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1191,6 +1332,9 @@ doOptPgpkeyfile(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1198,8 +1342,8 @@ doOptPgpkeyfile(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the pgpkeyring option.
*
- * @param pOptions the gnutls-serv options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-serv options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptPgpkeyring(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1212,6 +1356,9 @@ doOptPgpkeyring(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1219,8 +1366,8 @@ doOptPgpkeyring(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the pgpcertfile option.
*
- * @param pOptions the gnutls-serv options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-serv options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptPgpcertfile(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1233,6 +1380,9 @@ doOptPgpcertfile(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1240,8 +1390,8 @@ doOptPgpcertfile(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the srppasswd option.
*
- * @param pOptions the gnutls-serv options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-serv options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptSrppasswd(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1254,6 +1404,9 @@ doOptSrppasswd(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1261,8 +1414,8 @@ doOptSrppasswd(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the srppasswdconf option.
*
- * @param pOptions the gnutls-serv options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-serv options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptSrppasswdconf(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1275,6 +1428,9 @@ doOptSrppasswdconf(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
@@ -1282,8 +1438,8 @@ doOptSrppasswdconf(tOptions* pOptions, tOptDesc* pOptDesc)
/**
* Code to handle the pskpasswd option.
*
- * @param pOptions the gnutls-serv options data structure
- * @param pOptDesc the option descriptor for this option.
+ * @param[in] pOptions the gnutls-serv options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptPskpasswd(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1296,15 +1452,18 @@ doOptPskpasswd(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Code to handle the ocsp-response option.
- *
- * @param pOptions the gnutls-serv options data structure
- * @param pOptDesc the option descriptor for this option.
+ * If the client requested an OCSP response, return data from this file to the client.
+ * @param[in] pOptions the gnutls-serv options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptOcsp_Response(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -1317,9 +1476,12 @@ doOptOcsp_Response(tOptions* pOptions, tOptDesc* pOptDesc)
#endif
mode.file_flags = O_CLOEXEC;
+ /*
+ * This function handles special invalid values for "pOptions"
+ */
optionFileCheck(pOptions, pOptDesc, type, mode);
}
-/* extracted from optmain.tlib near line 1113 */
+/* extracted from optmain.tlib near line 1254 */
/**
* The directory containing the data associated with gnutls-serv.
@@ -1335,6 +1497,7 @@ doOptOcsp_Response(tOptions* pOptions, tOptDesc* pOptDesc)
#ifndef WITH_PACKAGER
# define gnutls_serv_packager_info NULL
#else
+/** Packager information for gnutls-serv. */
static char const gnutls_serv_packager_info[] =
"Packaged by " WITH_PACKAGER
@@ -1389,42 +1552,69 @@ tOptions gnutls_servOptions = {
};
#if ENABLE_NLS
+/**
+ * This code is designed to translate translatable option text for the
+ * gnutls-serv program. These translations happen upon entry
+ * to optionProcess().
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
#include <autoopts/usage-txt.h>
-static char* AO_gettext(char const* pz);
-static void coerce_it(void** s);
+static char * AO_gettext(char const * pz);
+static void coerce_it(void ** s);
/**
- * AutoGen specific wrapper function for gettext.
- * It relies on the macro _() to convert from English to the target
- * language, then strdup-duplicates the result string.
+ * AutoGen specific wrapper function for gettext. It relies on the macro _()
+ * to convert from English to the target language, then strdup-duplicates the
+ * result string. It tries the "libopts" domain first, then whatever has been
+ * set via the \a textdomain(3) call.
*
* @param[in] pz the input text used as a lookup key.
* @returns the translated text (if there is one),
* or the original text (if not).
*/
static char *
-AO_gettext(char const* pz)
+AO_gettext(char const * pz)
{
- char* pzRes;
+ char * res;
if (pz == NULL)
return NULL;
- pzRes = _(pz);
- if (pzRes == pz)
- return pzRes;
- pzRes = strdup(pzRes);
- if (pzRes == NULL) {
+#ifdef HAVE_DCGETTEXT
+ /*
+ * While processing the option_xlateable_txt data, try to use the
+ * "libopts" domain. Once we switch to the option descriptor data,
+ * do *not* use that domain.
+ */
+ if (option_xlateable_txt.field_ct != 0) {
+ res = dgettext("libopts", pz);
+ if (res == pz)
+ res = (char *)(void *)_(pz);
+ } else
+ res = (char *)(void *)_(pz);
+#else
+ res = (char *)(void *)_(pz);
+#endif
+ if (res == pz)
+ return res;
+ res = strdup(res);
+ if (res == NULL) {
fputs(_("No memory for duping translated strings\n"), stderr);
exit(GNUTLS_SERV_EXIT_FAILURE);
}
- return pzRes;
+ return res;
}
-static void coerce_it(void** s) { *s = AO_gettext(*s);
+/**
+ * All the pointers we use are marked "* const", but they are stored in
+ * writable memory. Coerce the mutability and set the pointer.
+ */
+static void coerce_it(void ** s) { *s = AO_gettext(*s);
}
/**
@@ -1434,56 +1624,506 @@ static void coerce_it(void** s) { *s = AO_gettext(*s);
static void
translate_option_strings(void)
{
- tOptions * const pOpt = &gnutls_servOptions;
+ tOptions * const opts = &gnutls_servOptions;
/*
* Guard against re-translation. It won't work. The strings will have
* been changed by the first pass through this code. One shot only.
*/
- if (option_usage_text.field_ct != 0) {
+ if (option_xlateable_txt.field_ct != 0) {
/*
* Do the translations. The first pointer follows the field count
* field. The field count field is the size of a pointer.
*/
- tOptDesc * pOD = pOpt->pOptDesc;
- char ** ppz = (char**)(void*)&(option_usage_text);
- int ix = option_usage_text.field_ct;
+ char ** ppz = (char**)(void*)&(option_xlateable_txt);
+ int ix = option_xlateable_txt.field_ct;
do {
- ppz++;
+ ppz++; /* skip over field_ct */
*ppz = AO_gettext(*ppz);
} while (--ix > 0);
-
- coerce_it((void*)&(pOpt->pzCopyright));
- coerce_it((void*)&(pOpt->pzCopyNotice));
- coerce_it((void*)&(pOpt->pzFullVersion));
- coerce_it((void*)&(pOpt->pzUsageTitle));
- coerce_it((void*)&(pOpt->pzExplain));
- coerce_it((void*)&(pOpt->pzDetail));
- coerce_it((void*)&(pOpt->pzPackager));
- coerce_it((void*)&(pOpt->pzShortUsage));
- option_usage_text.field_ct = 0;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++)
- coerce_it((void*)&(pOD->pzText));
- }
-
- if ((pOpt->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
- tOptDesc * pOD = pOpt->pOptDesc;
- int ix;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++) {
- coerce_it((void*)&(pOD->pz_Name));
- coerce_it((void*)&(pOD->pz_DisableName));
- coerce_it((void*)&(pOD->pz_DisablePfx));
+ /* prevent re-translation and disable "libopts" domain lookup */
+ option_xlateable_txt.field_ct = 0;
+
+ coerce_it((void*)&(opts->pzCopyright));
+ coerce_it((void*)&(opts->pzCopyNotice));
+ coerce_it((void*)&(opts->pzFullVersion));
+ 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));
}
- /* prevent re-translation */
- gnutls_servOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
}
-
#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 gnutls_servOptions structure noted in the comments below. The
+ literal text is defined in gnutls_serv_opt_strs.
+
+ NOTE: the strings below are segmented with respect to the source string
+ gnutls_serv_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 gnutls_servOptions.pzCopyright */
+ puts(_("gnutls-serv @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 gnutls_servOptions.pzCopyNotice */
+ puts(_("gnutls-serv is free software: you can redistribute it and/or modify it\n\
+under 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(_("gnutls-serv is distributed in the hope that it will be useful, but WITHOUT\n\
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n\
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\n\
+more 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 gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Enable debugging."));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Don't accept session tickets"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Generate Diffie-Hellman and RSA-export parameters"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Suppress some messages"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Do not use a resumption database"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Act as an HTTP server"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Act as an Echo server"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Use DTLS (datagram TLS) over UDP"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Set MTU for datagram TLS"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Offer SRTP profiles"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Do not request a client certificate"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Require a client certificate"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Activate heartbeat support"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Use DER format for certificates to read from"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Priorities string"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("DH params file to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Certificate file or PKCS #11 URL to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("CRL file to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("PGP Key file to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("PGP Key ring file to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("PGP Public Key (certificate) file to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("X.509 key file or PKCS #11 URL to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("X.509 Certificate file or PKCS #11 URL to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Alternative X.509 key file or PKCS #11 URL to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Alternative X.509 Certificate file or PKCS #11 URL to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Alternative X.509 key file or PKCS #11 URL to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Alternative X.509 Certificate file or PKCS #11 URL to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("PGP subkey to use (hex or auto)"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("SRP password file to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("SRP password configuration file to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("PSK password file to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("PSK identity hint to use"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("The OCSP response to send to client"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("The port to connect to"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("Print a list of the supported algorithms and modes"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("display extended usage information and exit"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("extended usage information passed thru pager"));
+
+ /* referenced via gnutls_servOptions.pOptDesc->pzText */
+ puts(_("output version information and exit"));
+
+ /* referenced via gnutls_servOptions.pzUsageTitle */
+ puts(_("gnutls-serv - GnuTLS server\n\
+Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
+
+ /* referenced via gnutls_servOptions.pzExplain */
+ puts(_("\n"));
+
+ /* referenced via gnutls_servOptions.pzDetail */
+ puts(_("Server program that listens to incoming TLS connections.\n"));
+
+ /* referenced via gnutls_servOptions.pzFullVersion */
+ puts(_("gnutls-serv @VERSION@"));
+
+ /* referenced via gnutls_servOptions.pzFullUsage */
+ puts(_("<<<NOT-FOUND>>>"));
+
+ /* referenced via gnutls_servOptions.pzShortUsage */
+ puts(_("Usage: gnutls-serv [options]\n\
+gnutls-serv --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/serv-args.h b/src/serv-args.h
index 27e47656ba..6cf285f5c1 100644
--- a/src/serv-args.h
+++ b/src/serv-args.h
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (serv-args.h)
- *
- * It has been AutoGen-ed November 8, 2012 at 11:35:50 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:17 PM by AutoGen 5.17.3
* From the definitions serv-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This header file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,24 +21,23 @@
*
* 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>
*
* gnutls-serv 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.
- *
+ *
* gnutls-serv 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 gnutls-serv program.
* These macros are documented in the AutoGen info file in the
@@ -49,22 +48,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 147460
+#define AO_TEMPLATE_VERSION 155648
#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:
+/**
+ * Enumeration of each option type for gnutls-serv
*/
typedef enum {
INDEX_OPT_DEBUG = 0,
@@ -106,44 +105,63 @@ typedef enum {
INDEX_OPT_HELP = 36,
INDEX_OPT_MORE_HELP = 37
} teOptIndex;
-
+/** count of all options for gnutls-serv */
#define OPTION_CT 38
+/** gnutls-serv version */
#define GNUTLS_SERV_VERSION "@VERSION@"
+/** Full gnutls-serv version text */
#define GNUTLS_SERV_FULL_VERSION "gnutls-serv @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) (gnutls_servOptions.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 gnutls-serv exit codes
*/
typedef enum {
- GNUTLS_SERV_EXIT_SUCCESS = 0,
- GNUTLS_SERV_EXIT_FAILURE = 1,
+ GNUTLS_SERV_EXIT_SUCCESS = 0,
+ GNUTLS_SERV_EXIT_FAILURE = 1,
+ GNUTLS_SERV_EXIT_USAGE_ERROR = 64,
GNUTLS_SERV_EXIT_LIBOPTS_FAILURE = 70
} gnutls_serv_exit_code_t;
-/* * * * * *
- *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/**
* Interface defines for specific options.
+ * @{
*/
#define VALUE_OPT_DEBUG 'd'
@@ -186,8 +204,11 @@ typedef enum {
#define OPT_VALUE_PORT (DESC(PORT).optArg.argInt)
#define VALUE_OPT_LIST 'l'
+/** 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
@@ -199,7 +220,7 @@ typedef enum {
gnutls_servOptions.pzCurOpt = NULL)
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*gnutls_servOptions.pUsageProc)(&gnutls_servOptions, c)
-/* extracted from opthead.tlib near line 484 */
+/* extracted from opthead.tlib near line 538 */
#ifdef __cplusplus
extern "C" {
@@ -219,6 +240,12 @@ extern tOptions gnutls_servOptions;
#if defined(ENABLE_NLS)
# ifndef _
# include <stdio.h>
+# ifndef HAVE_GETTEXT
+ extern char * gettext(char const *);
+# else
+# include <libintl.h>
+# endif
+
static inline char* aoGetsText(char const* pz) {
if (pz == NULL) return NULL;
return (char*)gettext(pz);
diff --git a/src/srptool-args.c b/src/srptool-args.c
index 204520ef86..950c852b50 100644
--- a/src/srptool-args.c
+++ b/src/srptool-args.c
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (srptool-args.c)
- *
- * It has been AutoGen-ed November 8, 2012 at 11:35:51 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:18 PM by AutoGen 5.17.3
* From the definitions srptool-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This source file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,20 +21,19 @@
*
* 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>
*
* srptool 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.
- *
+ *
* srptool 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/>.
*/
@@ -53,28 +52,24 @@
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 (srptool_opt_strs+0)
-#define zLicenseDescrip (srptool_opt_strs+278)
+#define zLicenseDescrip (srptool_opt_strs+274)
#ifndef NULL
# define NULL 0
#endif
-/*
- * srptool option static const strings
+/**
+ * static const strings for srptool options
*/
-static char const srptool_opt_strs[2049] =
+static char const srptool_opt_strs[2026] =
/* 0 */ "srptool @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\n"
- "GNU General Public License, version 3 or later\n"
- " <http://gnu.org/licenses/gpl.html>\n\0"
-/* 278 */ "srptool is free software: you can redistribute it and/or modify it under\n"
+ "redistribution under the terms of the GNU General Public License,\n"
+ "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0"
+/* 274 */ "srptool 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"
@@ -84,130 +79,161 @@ static char const srptool_opt_strs[2049] =
"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"
-/* 881 */ "Enable debugging.\0"
-/* 899 */ "DEBUG\0"
-/* 905 */ "debug\0"
-/* 911 */ "specify the index of the group parameters in tpasswd.conf to use.\0"
-/* 977 */ "INDEX\0"
-/* 983 */ "index\0"
-/* 989 */ "specify a username\0"
-/* 1008 */ "USERNAME\0"
-/* 1017 */ "username\0"
-/* 1026 */ "specify a password file.\0"
-/* 1051 */ "PASSWD\0"
-/* 1058 */ "passwd\0"
-/* 1065 */ "specify salt size.\0"
-/* 1084 */ "SALT\0"
-/* 1089 */ "salt\0"
-/* 1094 */ "just verify the password.\0"
-/* 1120 */ "VERIFY\0"
-/* 1127 */ "verify\0"
-/* 1134 */ "specify a password conf file.\0"
-/* 1164 */ "PASSWD_CONF\0"
-/* 1176 */ "passwd-conf\0"
-/* 1188 */ "Generate a password configuration file.\0"
-/* 1228 */ "CREATE_CONF\0"
-/* 1240 */ "create-conf\0"
-/* 1252 */ "Display extended usage information and exit\0"
-/* 1296 */ "help\0"
-/* 1301 */ "Extended usage information passed thru pager\0"
-/* 1346 */ "more-help\0"
-/* 1356 */ "Output version information and exit\0"
-/* 1392 */ "version\0"
-/* 1400 */ "SRPTOOL\0"
-/* 1408 */ "srptool - GnuTLS SRP tool - Ver. @VERSION@\n"
- "USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
-/* 1509 */ "bug-gnutls@gnu.org\0"
-/* 1528 */ "\n\n\0"
-/* 1531 */ "\n"
- "Simple program that emulates the programs in the Stanford SRP (Secure\n"
+/* 877 */ "Enable debugging.\0"
+/* 895 */ "DEBUG\0"
+/* 901 */ "debug\0"
+/* 907 */ "specify the index of the group parameters in tpasswd.conf to use.\0"
+/* 973 */ "INDEX\0"
+/* 979 */ "index\0"
+/* 985 */ "specify a username\0"
+/* 1004 */ "USERNAME\0"
+/* 1013 */ "username\0"
+/* 1022 */ "specify a password file.\0"
+/* 1047 */ "PASSWD\0"
+/* 1054 */ "passwd\0"
+/* 1061 */ "specify salt size.\0"
+/* 1080 */ "SALT\0"
+/* 1085 */ "salt\0"
+/* 1090 */ "just verify the password.\0"
+/* 1116 */ "VERIFY\0"
+/* 1123 */ "verify\0"
+/* 1130 */ "specify a password conf file.\0"
+/* 1160 */ "PASSWD_CONF\0"
+/* 1172 */ "passwd-conf\0"
+/* 1184 */ "Generate a password configuration file.\0"
+/* 1224 */ "CREATE_CONF\0"
+/* 1236 */ "create-conf\0"
+/* 1248 */ "display extended usage information and exit\0"
+/* 1292 */ "help\0"
+/* 1297 */ "extended usage information passed thru pager\0"
+/* 1342 */ "more-help\0"
+/* 1352 */ "output version information and exit\0"
+/* 1388 */ "version\0"
+/* 1396 */ "SRPTOOL\0"
+/* 1404 */ "srptool - GnuTLS SRP tool\n"
+ "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
+/* 1488 */ "bug-gnutls@gnu.org\0"
+/* 1507 */ "\n\0"
+/* 1509 */ "Simple program that emulates the programs in the Stanford SRP (Secure\n"
"Remote Password) libraries using GnuTLS. It is intended for use in places\n"
"where you don't expect SRP authentication to be the used for system users.\n\n"
"In brief, to use SRP you need to create two files. These are the password\n"
"file that holds the users and the verifiers associated with them and the\n"
"configuration file to hold the group parameters (called tpasswd.conf).\n\0"
-/* 1973 */ "srptool @VERSION@\0"
-/* 1991 */ "srptool [options]\n"
+/* 1950 */ "srptool @VERSION@\0"
+/* 1968 */ "srptool [options]\n"
"srptool --help for usage instructions.\n";
-/*
+/**
* debug option description:
*/
-#define DEBUG_DESC (srptool_opt_strs+881)
-#define DEBUG_NAME (srptool_opt_strs+899)
-#define DEBUG_name (srptool_opt_strs+905)
+/** Descriptive text for the debug option */
+#define DEBUG_DESC (srptool_opt_strs+877)
+/** Upper-cased name for the debug option */
+#define DEBUG_NAME (srptool_opt_strs+895)
+/** Name string for the debug option */
+#define DEBUG_name (srptool_opt_strs+901)
+/** Compiled in flag settings for the debug option */
#define DEBUG_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* index option description:
*/
-#define INDEX_DESC (srptool_opt_strs+911)
-#define INDEX_NAME (srptool_opt_strs+977)
-#define INDEX_name (srptool_opt_strs+983)
+/** Descriptive text for the index option */
+#define INDEX_DESC (srptool_opt_strs+907)
+/** Upper-cased name for the index option */
+#define INDEX_NAME (srptool_opt_strs+973)
+/** Name string for the index option */
+#define INDEX_name (srptool_opt_strs+979)
+/** Compiled in flag settings for the index option */
#define INDEX_FLAGS (OPTST_DISABLED)
-/*
+/**
* username option description:
*/
-#define USERNAME_DESC (srptool_opt_strs+989)
-#define USERNAME_NAME (srptool_opt_strs+1008)
-#define USERNAME_name (srptool_opt_strs+1017)
+/** Descriptive text for the username option */
+#define USERNAME_DESC (srptool_opt_strs+985)
+/** Upper-cased name for the username option */
+#define USERNAME_NAME (srptool_opt_strs+1004)
+/** Name string for the username option */
+#define USERNAME_name (srptool_opt_strs+1013)
+/** Compiled in flag settings for the username option */
#define USERNAME_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* passwd option description:
*/
-#define PASSWD_DESC (srptool_opt_strs+1026)
-#define PASSWD_NAME (srptool_opt_strs+1051)
-#define PASSWD_name (srptool_opt_strs+1058)
+/** Descriptive text for the passwd option */
+#define PASSWD_DESC (srptool_opt_strs+1022)
+/** Upper-cased name for the passwd option */
+#define PASSWD_NAME (srptool_opt_strs+1047)
+/** Name string for the passwd option */
+#define PASSWD_name (srptool_opt_strs+1054)
+/** Compiled in flag settings for the passwd option */
#define PASSWD_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* salt option description:
*/
-#define SALT_DESC (srptool_opt_strs+1065)
-#define SALT_NAME (srptool_opt_strs+1084)
-#define SALT_name (srptool_opt_strs+1089)
+/** Descriptive text for the salt option */
+#define SALT_DESC (srptool_opt_strs+1061)
+/** Upper-cased name for the salt option */
+#define SALT_NAME (srptool_opt_strs+1080)
+/** Name string for the salt option */
+#define SALT_name (srptool_opt_strs+1085)
+/** Compiled in flag settings for the salt option */
#define SALT_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-/*
+/**
* verify option description:
*/
-#define VERIFY_DESC (srptool_opt_strs+1094)
-#define VERIFY_NAME (srptool_opt_strs+1120)
-#define VERIFY_name (srptool_opt_strs+1127)
+/** Descriptive text for the verify option */
+#define VERIFY_DESC (srptool_opt_strs+1090)
+/** Upper-cased name for the verify option */
+#define VERIFY_NAME (srptool_opt_strs+1116)
+/** Name string for the verify option */
+#define VERIFY_name (srptool_opt_strs+1123)
+/** Compiled in flag settings for the verify option */
#define VERIFY_FLAGS (OPTST_DISABLED)
-/*
+/**
* passwd-conf option description:
*/
-#define PASSWD_CONF_DESC (srptool_opt_strs+1134)
-#define PASSWD_CONF_NAME (srptool_opt_strs+1164)
-#define PASSWD_CONF_name (srptool_opt_strs+1176)
+/** Descriptive text for the passwd-conf option */
+#define PASSWD_CONF_DESC (srptool_opt_strs+1130)
+/** Upper-cased name for the passwd-conf option */
+#define PASSWD_CONF_NAME (srptool_opt_strs+1160)
+/** Name string for the passwd-conf option */
+#define PASSWD_CONF_name (srptool_opt_strs+1172)
+/** Compiled in flag settings for the passwd-conf option */
#define PASSWD_CONF_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
+/**
* create-conf option description:
*/
-#define CREATE_CONF_DESC (srptool_opt_strs+1188)
-#define CREATE_CONF_NAME (srptool_opt_strs+1228)
-#define CREATE_CONF_name (srptool_opt_strs+1240)
+/** Descriptive text for the create-conf option */
+#define CREATE_CONF_DESC (srptool_opt_strs+1184)
+/** Upper-cased name for the create-conf option */
+#define CREATE_CONF_NAME (srptool_opt_strs+1224)
+/** Name string for the create-conf option */
+#define CREATE_CONF_name (srptool_opt_strs+1236)
+/** Compiled in flag settings for the create-conf option */
#define CREATE_CONF_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
/*
* Help/More_Help/Version option descriptions:
*/
-#define HELP_DESC (srptool_opt_strs+1252)
-#define HELP_name (srptool_opt_strs+1296)
+#define HELP_DESC (srptool_opt_strs+1248)
+#define HELP_name (srptool_opt_strs+1292)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (srptool_opt_strs+1301)
-#define MORE_HELP_name (srptool_opt_strs+1346)
+#define MORE_HELP_DESC (srptool_opt_strs+1297)
+#define MORE_HELP_name (srptool_opt_strs+1342)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC NULL
@@ -220,9 +246,9 @@ static char const srptool_opt_strs[2049] =
# define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
#endif
-#define VER_DESC (srptool_opt_strs+1356)
-#define VER_name (srptool_opt_strs+1392)
-/*
+#define VER_DESC (srptool_opt_strs+1352)
+#define VER_name (srptool_opt_strs+1388)
+/**
* Declare option callback procedures
*/
extern tOptProc
@@ -341,7 +367,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, 0,
+ /* opt state flags */ VER_FLAGS, AOUSE_VERSION,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -355,7 +381,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, 0,
+ /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -367,7 +393,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, 0,
+ /* opt state flags */ MORE_HELP_FLAGS, AOUSE_MORE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -377,19 +403,24 @@ static tOptDesc optDesc[OPTION_CT] = {
};
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Define the srptool Option Environment
- */
-#define zPROGNAME (srptool_opt_strs+1400)
-#define zUsageTitle (srptool_opt_strs+1408)
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/** Reference to the upper cased version of srptool. */
+#define zPROGNAME (srptool_opt_strs+1396)
+/** Reference to the title line for srptool usage. */
+#define zUsageTitle (srptool_opt_strs+1404)
+/** There is no srptool configuration file. */
#define zRcName NULL
+/** There are no directories to search for srptool config files. */
#define apzHomeList NULL
-#define zBugsAddr (srptool_opt_strs+1509)
-#define zExplain (srptool_opt_strs+1528)
-#define zDetail (srptool_opt_strs+1531)
-#define zFullVersion (srptool_opt_strs+1973)
-/* extracted from optcode.tlib near line 350 */
+/** The srptool program bug email address. */
+#define zBugsAddr (srptool_opt_strs+1488)
+/** Clarification/explanation of what srptool does. */
+#define zExplain (srptool_opt_strs+1507)
+/** Extra detail explaining what srptool does. */
+#define zDetail (srptool_opt_strs+1509)
+/** The full version string for srptool. */
+#define zFullVersion (srptool_opt_strs+1950)
+/* extracted from optcode.tlib near line 371 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT
@@ -399,10 +430,8 @@ static tOptDesc optDesc[OPTION_CT] = {
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
-
#define srptool_full_usage (NULL)
-
-#define srptool_short_usage (srptool_opt_strs+1991)
+#define srptool_short_usage (srptool_opt_strs+1968)
#endif /* not defined __doxygen__ */
@@ -412,8 +441,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/**
* The callout function that invokes the optionUsage function.
*
- * @param pOptions the AutoOpts option description structure
- * @param pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] pOptions the AutoOpts option description structure
+ * @param[in] pOptDesc the descriptor for the "help" (usage) option.
* @noreturn
*/
static void
@@ -428,9 +457,9 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Code to handle the debug option.
- *
- * @param pOptions the srptool options data structure
- * @param pOptDesc the option descriptor for this option.
+ * Specifies the debug level.
+ * @param[in] pOptions the srptool options data structure
+ * @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -456,11 +485,10 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
option_usage_fp = stderr;
-emit_ranges:
-
+ emit_ranges:
optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
}
-/* extracted from optmain.tlib near line 1113 */
+/* extracted from optmain.tlib near line 1254 */
/**
* The directory containing the data associated with srptool.
@@ -476,6 +504,7 @@ emit_ranges:
#ifndef WITH_PACKAGER
# define srptool_packager_info NULL
#else
+/** Packager information for srptool. */
static char const srptool_packager_info[] =
"Packaged by " WITH_PACKAGER
@@ -530,42 +559,69 @@ tOptions srptoolOptions = {
};
#if ENABLE_NLS
+/**
+ * This code is designed to translate translatable option text for the
+ * srptool program. These translations happen upon entry
+ * to optionProcess().
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
#include <autoopts/usage-txt.h>
-static char* AO_gettext(char const* pz);
-static void coerce_it(void** s);
+static char * AO_gettext(char const * pz);
+static void coerce_it(void ** s);
/**
- * AutoGen specific wrapper function for gettext.
- * It relies on the macro _() to convert from English to the target
- * language, then strdup-duplicates the result string.
+ * AutoGen specific wrapper function for gettext. It relies on the macro _()
+ * to convert from English to the target language, then strdup-duplicates the
+ * result string. It tries the "libopts" domain first, then whatever has been
+ * set via the \a textdomain(3) call.
*
* @param[in] pz the input text used as a lookup key.
* @returns the translated text (if there is one),
* or the original text (if not).
*/
static char *
-AO_gettext(char const* pz)
+AO_gettext(char const * pz)
{
- char* pzRes;
+ char * res;
if (pz == NULL)
return NULL;
- pzRes = _(pz);
- if (pzRes == pz)
- return pzRes;
- pzRes = strdup(pzRes);
- if (pzRes == NULL) {
+#ifdef HAVE_DCGETTEXT
+ /*
+ * While processing the option_xlateable_txt data, try to use the
+ * "libopts" domain. Once we switch to the option descriptor data,
+ * do *not* use that domain.
+ */
+ if (option_xlateable_txt.field_ct != 0) {
+ res = dgettext("libopts", pz);
+ if (res == pz)
+ res = (char *)(void *)_(pz);
+ } else
+ res = (char *)(void *)_(pz);
+#else
+ res = (char *)(void *)_(pz);
+#endif
+ if (res == pz)
+ return res;
+ res = strdup(res);
+ if (res == NULL) {
fputs(_("No memory for duping translated strings\n"), stderr);
exit(SRPTOOL_EXIT_FAILURE);
}
- return pzRes;
+ return res;
}
-static void coerce_it(void** s) { *s = AO_gettext(*s);
+/**
+ * All the pointers we use are marked "* const", but they are stored in
+ * writable memory. Coerce the mutability and set the pointer.
+ */
+static void coerce_it(void ** s) { *s = AO_gettext(*s);
}
/**
@@ -575,56 +631,430 @@ static void coerce_it(void** s) { *s = AO_gettext(*s);
static void
translate_option_strings(void)
{
- tOptions * const pOpt = &srptoolOptions;
+ tOptions * const opts = &srptoolOptions;
/*
* Guard against re-translation. It won't work. The strings will have
* been changed by the first pass through this code. One shot only.
*/
- if (option_usage_text.field_ct != 0) {
+ if (option_xlateable_txt.field_ct != 0) {
/*
* Do the translations. The first pointer follows the field count
* field. The field count field is the size of a pointer.
*/
- tOptDesc * pOD = pOpt->pOptDesc;
- char ** ppz = (char**)(void*)&(option_usage_text);
- int ix = option_usage_text.field_ct;
+ char ** ppz = (char**)(void*)&(option_xlateable_txt);
+ int ix = option_xlateable_txt.field_ct;
do {
- ppz++;
+ ppz++; /* skip over field_ct */
*ppz = AO_gettext(*ppz);
} while (--ix > 0);
+ /* prevent re-translation and disable "libopts" domain lookup */
+ option_xlateable_txt.field_ct = 0;
- coerce_it((void*)&(pOpt->pzCopyright));
- coerce_it((void*)&(pOpt->pzCopyNotice));
- coerce_it((void*)&(pOpt->pzFullVersion));
- coerce_it((void*)&(pOpt->pzUsageTitle));
- coerce_it((void*)&(pOpt->pzExplain));
- coerce_it((void*)&(pOpt->pzDetail));
- coerce_it((void*)&(pOpt->pzPackager));
- coerce_it((void*)&(pOpt->pzShortUsage));
- option_usage_text.field_ct = 0;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++)
- coerce_it((void*)&(pOD->pzText));
- }
-
- if ((pOpt->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
- tOptDesc * pOD = pOpt->pOptDesc;
- int ix;
-
- for (ix = pOpt->optCt; ix > 0; ix--, pOD++) {
- coerce_it((void*)&(pOD->pz_Name));
- coerce_it((void*)&(pOD->pz_DisableName));
- coerce_it((void*)&(pOD->pz_DisablePfx));
+ coerce_it((void*)&(opts->pzCopyright));
+ coerce_it((void*)&(opts->pzCopyNotice));
+ coerce_it((void*)&(opts->pzFullVersion));
+ 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));
}
- /* prevent re-translation */
- srptoolOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
}
-
#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 srptoolOptions structure noted in the comments below. The
+ literal text is defined in srptool_opt_strs.
+
+ NOTE: the strings below are segmented with respect to the source string
+ srptool_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 srptoolOptions.pzCopyright */
+ puts(_("srptool @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 srptoolOptions.pzCopyNotice */
+ puts(_("srptool 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(_("srptool 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 srptoolOptions.pOptDesc->pzText */
+ puts(_("Enable debugging."));
+
+ /* referenced via srptoolOptions.pOptDesc->pzText */
+ puts(_("specify the index of the group parameters in tpasswd.conf to use."));
+
+ /* referenced via srptoolOptions.pOptDesc->pzText */
+ puts(_("specify a username"));
+
+ /* referenced via srptoolOptions.pOptDesc->pzText */
+ puts(_("specify a password file."));
+
+ /* referenced via srptoolOptions.pOptDesc->pzText */
+ puts(_("specify salt size."));
+
+ /* referenced via srptoolOptions.pOptDesc->pzText */
+ puts(_("just verify the password."));
+
+ /* referenced via srptoolOptions.pOptDesc->pzText */
+ puts(_("specify a password conf file."));
+
+ /* referenced via srptoolOptions.pOptDesc->pzText */
+ puts(_("Generate a password configuration file."));
+
+ /* referenced via srptoolOptions.pOptDesc->pzText */
+ puts(_("display extended usage information and exit"));
+
+ /* referenced via srptoolOptions.pOptDesc->pzText */
+ puts(_("extended usage information passed thru pager"));
+
+ /* referenced via srptoolOptions.pOptDesc->pzText */
+ puts(_("output version information and exit"));
+
+ /* referenced via srptoolOptions.pzUsageTitle */
+ puts(_("srptool - GnuTLS SRP tool\n\
+Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
+
+ /* referenced via srptoolOptions.pzExplain */
+ puts(_("\n"));
+
+ /* referenced via srptoolOptions.pzDetail */
+ puts(_("Simple program that emulates the programs in the Stanford SRP (Secure\n\
+Remote Password) libraries using GnuTLS. It is intended for use in places\n\
+where you don't expect SRP authentication to be the used for system users.\n\n"));
+ puts(_("In brief, to use SRP you need to create two files. These are the password\n\
+file that holds the users and the verifiers associated with them and the\n\
+configuration file to hold the group parameters (called tpasswd.conf).\n"));
+
+ /* referenced via srptoolOptions.pzFullVersion */
+ puts(_("srptool @VERSION@"));
+
+ /* referenced via srptoolOptions.pzFullUsage */
+ puts(_("<<<NOT-FOUND>>>"));
+
+ /* referenced via srptoolOptions.pzShortUsage */
+ puts(_("srptool [options]\n\
+srptool --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/srptool-args.h b/src/srptool-args.h
index 0e1dd4f7e2..e1888b22fb 100644
--- a/src/srptool-args.h
+++ b/src/srptool-args.h
@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
- *
+ *
* DO NOT EDIT THIS FILE (srptool-args.h)
- *
- * It has been AutoGen-ed November 8, 2012 at 11:35:51 PM by AutoGen 5.16
+ *
+ * It has been AutoGen-ed May 29, 2013 at 07:49:17 PM by AutoGen 5.17.3
* From the definitions srptool-args.def
* and the template file options
*
- * Generated from AutoOpts 36:4:11 templates.
+ * Generated from AutoOpts 38:0:13 templates.
*
* AutoOpts is a copyrighted work. This header file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,24 +21,23 @@
*
* 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>
*
* srptool 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.
- *
+ *
* srptool 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 srptool program.
* These macros are documented in the AutoGen info file in the
@@ -49,22 +48,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 147460
+#define AO_TEMPLATE_VERSION 155648
#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:
+/**
+ * Enumeration of each option type for srptool
*/
typedef enum {
INDEX_OPT_DEBUG = 0,
@@ -79,44 +78,63 @@ typedef enum {
INDEX_OPT_HELP = 9,
INDEX_OPT_MORE_HELP = 10
} teOptIndex;
-
+/** count of all options for srptool */
#define OPTION_CT 11
+/** srptool version */
#define SRPTOOL_VERSION "@VERSION@"
+/** Full srptool version text */
#define SRPTOOL_FULL_VERSION "srptool @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) (srptoolOptions.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 srptool exit codes
*/
typedef enum {
- SRPTOOL_EXIT_SUCCESS = 0,
- SRPTOOL_EXIT_FAILURE = 1,
- SRPTOOL_EXIT_LIBOPTS_FAILURE = 70
+ SRPTOOL_EXIT_SUCCESS = 0,
+ SRPTOOL_EXIT_FAILURE = 1,
+ SRPTOOL_EXIT_USAGE_ERROR = 64,
+ SRPTOOL_EXIT_LIBOPTS_FAILURE = 70
} srptool_exit_code_t;
-/* * * * * *
- *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/**
* Interface defines for specific options.
+ * @{
*/
#define VALUE_OPT_DEBUG 'd'
@@ -130,8 +148,11 @@ typedef enum {
#define VALUE_OPT_VERIFY 5
#define VALUE_OPT_PASSWD_CONF 'v'
#define VALUE_OPT_CREATE_CONF 7
+/** 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
@@ -143,7 +164,7 @@ typedef enum {
srptoolOptions.pzCurOpt = NULL)
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*srptoolOptions.pUsageProc)(&srptoolOptions, c)
-/* extracted from opthead.tlib near line 484 */
+/* extracted from opthead.tlib near line 538 */
#ifdef __cplusplus
extern "C" {
@@ -163,6 +184,12 @@ extern tOptions srptoolOptions;
#if defined(ENABLE_NLS)
# ifndef _
# include <stdio.h>
+# ifndef HAVE_GETTEXT
+ extern char * gettext(char const *);
+# else
+# include <libintl.h>
+# endif
+
static inline char* aoGetsText(char const* pz) {
if (pz == NULL) return NULL;
return (char*)gettext(pz);
View Lorry Controller Status