From: Nikos Mavrogiannopoulos Date: Fri, 4 Oct 2013 10:45:11 +0000 (+0200) Subject: autogen'ed files update X-Git-Tag: gnutls_3_2_5~35 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc2d65e4a75ca5b6c61566e82eab7530d0e43d6b;p=thirdparty%2Fgnutls.git autogen'ed files update --- diff --git a/doc/invoke-gnutls-cli.texi b/doc/invoke-gnutls-cli.texi index d02d52f9ad..94978e9b55 100644 --- a/doc/invoke-gnutls-cli.texi +++ b/doc/invoke-gnutls-cli.texi @@ -3,10 +3,10 @@ @pindex gnutls-cli @ignore # -*- buffer-read-only: t -*- vi: set ro: -# +# # DO NOT EDIT THIS FILE (invoke-gnutls-cli.texi) -# -# It has been AutoGen-ed May 5, 2013 at 03:51:56 PM by AutoGen 5.17.3 +# +# It has been AutoGen-ed October 4, 2013 at 12:44:32 PM by AutoGen 5.17 # From the definitions ../src/cli-args.def # and the template file agtexi-cmd.tpl @end ignore @@ -36,8 +36,8 @@ with a status code of 0. @exampleindent 0 @example -gnutls-cli - GnuTLS client -Usage: gnutls-cli [ - [] | --[@{=| @}] ]... [hostname] +gnutls-cli - GnuTLS client - Ver. @@VERSION@@ +USAGE: gnutls-cli [ - [] | --[@{=| @}] ]... [hostname] -d, --debug=num Enable debugging. - it must be in the range: @@ -102,14 +102,19 @@ Usage: gnutls-cli [ - [] | --[@{=| @}] ]... [hostname] 0 to 4096 --disable-sni Do not send a Server Name Indication (SNI) --disable-extensions Disable all the TLS extensions - -v, --version[=arg] output version information and exit - -h, --help display extended usage information and exit - -!, --more-help extended usage information passed thru pager + --inline-commands Inline commands of the form ^^ + --inline-commands-prefix=str Change the default (^) used as a delimiter for inline commands. The +value is a single US-ASCII character (octets 0 - 127). + -v, --version[=arg] Output version information and exit + -h, --help Display extended usage information and exit + -!, --more-help Extended usage information passed thru pager Options are specified by doubled hyphens and their name or by a single hyphen and the flag character. Operands and options may be intermixed. They will be reordered. + + Simple client program to set up a TLS connection to some other computer. It sets up a TLS connection and forwards data from the standard input to the secured socket and vice versa. @@ -221,6 +226,18 @@ This option will set and enable the Application Layer Protocol Negotiation (ALP This is the ``disable all the tls extensions'' option. This option disables all TLS extensions. Deprecated option. Use the priority string. +@anchor{gnutls-cli inline-commands} +@subheading inline-commands option + +This is the ``inline commands of the form ^^'' option. +Enable inline commands of the form ^^. The inline commands are expected to be in a line by themselves +@anchor{gnutls-cli inline-commands-prefix} +@subheading inline-commands-prefix option + +This is the ``change the default (^) used as a delimiter for inline commands. + the value is a single us-ascii character (octets 0 - 127).'' option. +This option takes an argument string. +Change the default (^) delimiter used for inline commands. The delimiter is expected to be a single US-ASCII character (octets 0 - 127). This option is only relevant if inline commands are enabled via the inline-commands option @anchor{gnutls-cli exit status} @subheading gnutls-cli exit status @@ -234,6 +251,7 @@ The operation failed or the command syntax was not valid. @anchor{gnutls-cli See Also} @subheading gnutls-cli See Also gnutls-cli-debug(1), gnutls-serv(1) + @anchor{gnutls-cli Examples} @subheading gnutls-cli Examples @subheading Connecting using PSK authentication @@ -274,3 +292,4 @@ Compression: COMP-NULL Elliptic curves: CURVE-SECP384R1, CURVE-SECP521R1 PK-signatures: SIGN-RSA-SHA384, SIGN-ECDSA-SHA384, SIGN-RSA-SHA512, SIGN-ECDSA-SHA512 @end example + diff --git a/src/cli-args.c b/src/cli-args.c index 6e4c3f7607..ed87fc0c57 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 May 5, 2013 at 01:00:26 PM by AutoGen 5.17.3 + * + * It has been AutoGen-ed October 4, 2013 at 12:44:10 PM by AutoGen 5.17 * From the definitions cli-args.def * and the template file options * - * Generated from AutoOpts 38:0:13 templates. + * Generated from AutoOpts 37:0:12 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -21,19 +21,20 @@ * * Copyright (C) 2000-2012 Free Software Foundation, all rights reserved. * This is free software. It is licensed for use, modification and - * redistribution under the terms of the GNU General Public License, - * version 3 or later + * redistribution under the terms of the + * GNU General Public License, version 3 or later + * * * 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 . */ @@ -52,24 +53,28 @@ extern "C" { #endif extern FILE * option_usage_fp; + +/* TRANSLATORS: choose the translation for option names wisely because you + cannot ever change your mind. */ #define zCopyright (gnutls_cli_opt_strs+0) -#define zLicenseDescrip (gnutls_cli_opt_strs+277) +#define zLicenseDescrip (gnutls_cli_opt_strs+281) #ifndef NULL # define NULL 0 #endif -/** - * static const strings for gnutls-cli options +/* + * gnutls-cli option static const strings */ -static char const gnutls_cli_opt_strs[3934] = +static char const gnutls_cli_opt_strs[4195] = /* 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 GNU General Public License,\n" - "version 3 or later \n\0" -/* 277 */ "gnutls-cli is free software: you can redistribute it and/or modify it under\n" + "redistribution under the terms of the\n" + "GNU General Public License, version 3 or later\n" + " \n\0" +/* 281 */ "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" @@ -79,748 +84,583 @@ static char const gnutls_cli_opt_strs[3934] = "more details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see .\n\0" -/* 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 */ "Establish a session and rehandshake\0" -/* 1340 */ "REHANDSHAKE\0" -/* 1352 */ "rehandshake\0" -/* 1364 */ "Connect, establish a plain session and start TLS.\0" -/* 1414 */ "STARTTLS\0" -/* 1423 */ "starttls\0" -/* 1432 */ "Use DTLS (datagram TLS) over UDP\0" -/* 1465 */ "UDP\0" -/* 1469 */ "udp\0" -/* 1473 */ "Set MTU for datagram TLS\0" -/* 1498 */ "MTU\0" -/* 1502 */ "mtu\0" -/* 1506 */ "Send CR LF instead of LF\0" -/* 1531 */ "CRLF\0" -/* 1536 */ "crlf\0" -/* 1541 */ "Use DER format for certificates to read from\0" -/* 1586 */ "X509FMTDER\0" -/* 1597 */ "x509fmtder\0" -/* 1608 */ "Send the openpgp fingerprint, instead of the key\0" -/* 1657 */ "FINGERPRINT\0" -/* 1669 */ "fingerprint\0" -/* 1681 */ "Print peer's certificate in PEM format\0" -/* 1720 */ "PRINT_CERT\0" -/* 1731 */ "print-cert\0" -/* 1742 */ "The minimum number of bits allowed for DH\0" -/* 1784 */ "DH_BITS\0" -/* 1792 */ "dh-bits\0" -/* 1800 */ "Priorities string\0" -/* 1818 */ "PRIORITY\0" -/* 1827 */ "priority\0" -/* 1836 */ "Certificate file or PKCS #11 URL to use\0" -/* 1876 */ "X509CAFILE\0" -/* 1887 */ "x509cafile\0" -/* 1898 */ "CRL file to use\0" -/* 1914 */ "X509CRLFILE\0" -/* 1926 */ "x509crlfile\0" -/* 1938 */ "PGP Key file to use\0" -/* 1958 */ "PGPKEYFILE\0" -/* 1969 */ "pgpkeyfile\0" -/* 1980 */ "PGP Key ring file to use\0" -/* 2005 */ "PGPKEYRING\0" -/* 2016 */ "pgpkeyring\0" -/* 2027 */ "PGP Public Key (certificate) file to use\0" -/* 2068 */ "PGPCERTFILE\0" -/* 2080 */ "pgpcertfile\0" -/* 2092 */ "X.509 key file or PKCS #11 URL to use\0" -/* 2130 */ "X509KEYFILE\0" -/* 2142 */ "x509keyfile\0" -/* 2154 */ "X.509 Certificate file or PKCS #11 URL to use\0" -/* 2200 */ "X509CERTFILE\0" -/* 2213 */ "x509certfile\0" -/* 2226 */ "PGP subkey to use (hex or auto)\0" -/* 2258 */ "PGPSUBKEY\0" -/* 2268 */ "pgpsubkey\0" -/* 2278 */ "SRP username to use\0" -/* 2298 */ "SRPUSERNAME\0" -/* 2310 */ "srpusername\0" -/* 2322 */ "SRP password to use\0" -/* 2342 */ "SRPPASSWD\0" -/* 2352 */ "srppasswd\0" -/* 2362 */ "PSK username to use\0" -/* 2382 */ "PSKUSERNAME\0" -/* 2394 */ "pskusername\0" -/* 2406 */ "PSK key (in hex) to use\0" -/* 2430 */ "PSKKEY\0" -/* 2437 */ "pskkey\0" -/* 2444 */ "The port or service to connect to\0" -/* 2478 */ "PORT\0" -/* 2483 */ "port\0" -/* 2488 */ "Don't abort program if server certificate can't be validated\0" -/* 2549 */ "INSECURE\0" -/* 2558 */ "insecure\0" -/* 2567 */ "Use length-hiding padding to prevent traffic analysis\0" -/* 2621 */ "RANGES\0" -/* 2628 */ "ranges\0" -/* 2635 */ "Benchmark individual ciphers\0" -/* 2664 */ "BENCHMARK_CIPHERS\0" -/* 2682 */ "benchmark-ciphers\0" -/* 2700 */ "Benchmark individual software ciphers (no hw acceleration)\0" -/* 2759 */ "BENCHMARK_SOFT_CIPHERS\0" -/* 2782 */ "benchmark-soft-ciphers\0" -/* 2805 */ "Benchmark TLS key exchange methods\0" -/* 2840 */ "BENCHMARK_TLS_KX\0" -/* 2857 */ "benchmark-tls-kx\0" -/* 2874 */ "Benchmark TLS ciphers\0" -/* 2896 */ "BENCHMARK_TLS_CIPHERS\0" -/* 2918 */ "benchmark-tls-ciphers\0" -/* 2940 */ "Print a list of the supported algorithms and modes\0" -/* 2991 */ "LIST\0" -/* 2996 */ "list\0" -/* 3001 */ "Don't allow session tickets\0" -/* 3029 */ "NOTICKET\0" -/* 3038 */ "noticket\0" -/* 3047 */ "Offer SRTP profiles\0" -/* 3067 */ "SRTP_PROFILES\0" -/* 3081 */ "srtp-profiles\0" -/* 3095 */ "Application layer protocol\0" -/* 3122 */ "ALPN\0" -/* 3127 */ "alpn\0" -/* 3132 */ "Activate heartbeat support\0" -/* 3159 */ "HEARTBEAT\0" -/* 3169 */ "heartbeat\0" -/* 3179 */ "The maximum record size to advertize\0" -/* 3216 */ "RECORDSIZE\0" -/* 3227 */ "recordsize\0" -/* 3238 */ "Do not send a Server Name Indication (SNI)\0" -/* 3281 */ "DISABLE_SNI\0" -/* 3293 */ "disable-sni\0" -/* 3305 */ "Disable all the TLS extensions\0" -/* 3336 */ "DISABLE_EXTENSIONS\0" -/* 3355 */ "disable-extensions\0" -/* 3374 */ "display extended usage information and exit\0" -/* 3418 */ "help\0" -/* 3423 */ "extended usage information passed thru pager\0" -/* 3468 */ "more-help\0" -/* 3478 */ "output version information and exit\0" -/* 3514 */ "version\0" -/* 3522 */ "GNUTLS_CLI\0" -/* 3533 */ "gnutls-cli - GnuTLS client\n" - "Usage: %s [ - [] | --[{=| }] ]... [hostname]\n\0" -/* 3629 */ "bug-gnutls@gnu.org\0" -/* 3648 */ "\n\0" -/* 3650 */ "Simple client program to set up a TLS connection to some other computer. It\n" +/* 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 */ "Establish a session and rehandshake\0" +/* 1344 */ "REHANDSHAKE\0" +/* 1356 */ "rehandshake\0" +/* 1368 */ "Connect, establish a plain session and start TLS.\0" +/* 1418 */ "STARTTLS\0" +/* 1427 */ "starttls\0" +/* 1436 */ "Use DTLS (datagram TLS) over UDP\0" +/* 1469 */ "UDP\0" +/* 1473 */ "udp\0" +/* 1477 */ "Set MTU for datagram TLS\0" +/* 1502 */ "MTU\0" +/* 1506 */ "mtu\0" +/* 1510 */ "Send CR LF instead of LF\0" +/* 1535 */ "CRLF\0" +/* 1540 */ "crlf\0" +/* 1545 */ "Use DER format for certificates to read from\0" +/* 1590 */ "X509FMTDER\0" +/* 1601 */ "x509fmtder\0" +/* 1612 */ "Send the openpgp fingerprint, instead of the key\0" +/* 1661 */ "FINGERPRINT\0" +/* 1673 */ "fingerprint\0" +/* 1685 */ "Print peer's certificate in PEM format\0" +/* 1724 */ "PRINT_CERT\0" +/* 1735 */ "print-cert\0" +/* 1746 */ "The minimum number of bits allowed for DH\0" +/* 1788 */ "DH_BITS\0" +/* 1796 */ "dh-bits\0" +/* 1804 */ "Priorities string\0" +/* 1822 */ "PRIORITY\0" +/* 1831 */ "priority\0" +/* 1840 */ "Certificate file or PKCS #11 URL to use\0" +/* 1880 */ "X509CAFILE\0" +/* 1891 */ "x509cafile\0" +/* 1902 */ "CRL file to use\0" +/* 1918 */ "X509CRLFILE\0" +/* 1930 */ "x509crlfile\0" +/* 1942 */ "PGP Key file to use\0" +/* 1962 */ "PGPKEYFILE\0" +/* 1973 */ "pgpkeyfile\0" +/* 1984 */ "PGP Key ring file to use\0" +/* 2009 */ "PGPKEYRING\0" +/* 2020 */ "pgpkeyring\0" +/* 2031 */ "PGP Public Key (certificate) file to use\0" +/* 2072 */ "PGPCERTFILE\0" +/* 2084 */ "pgpcertfile\0" +/* 2096 */ "X.509 key file or PKCS #11 URL to use\0" +/* 2134 */ "X509KEYFILE\0" +/* 2146 */ "x509keyfile\0" +/* 2158 */ "X.509 Certificate file or PKCS #11 URL to use\0" +/* 2204 */ "X509CERTFILE\0" +/* 2217 */ "x509certfile\0" +/* 2230 */ "PGP subkey to use (hex or auto)\0" +/* 2262 */ "PGPSUBKEY\0" +/* 2272 */ "pgpsubkey\0" +/* 2282 */ "SRP username to use\0" +/* 2302 */ "SRPUSERNAME\0" +/* 2314 */ "srpusername\0" +/* 2326 */ "SRP password to use\0" +/* 2346 */ "SRPPASSWD\0" +/* 2356 */ "srppasswd\0" +/* 2366 */ "PSK username to use\0" +/* 2386 */ "PSKUSERNAME\0" +/* 2398 */ "pskusername\0" +/* 2410 */ "PSK key (in hex) to use\0" +/* 2434 */ "PSKKEY\0" +/* 2441 */ "pskkey\0" +/* 2448 */ "The port or service to connect to\0" +/* 2482 */ "PORT\0" +/* 2487 */ "port\0" +/* 2492 */ "Don't abort program if server certificate can't be validated\0" +/* 2553 */ "INSECURE\0" +/* 2562 */ "insecure\0" +/* 2571 */ "Use length-hiding padding to prevent traffic analysis\0" +/* 2625 */ "RANGES\0" +/* 2632 */ "ranges\0" +/* 2639 */ "Benchmark individual ciphers\0" +/* 2668 */ "BENCHMARK_CIPHERS\0" +/* 2686 */ "benchmark-ciphers\0" +/* 2704 */ "Benchmark individual software ciphers (no hw acceleration)\0" +/* 2763 */ "BENCHMARK_SOFT_CIPHERS\0" +/* 2786 */ "benchmark-soft-ciphers\0" +/* 2809 */ "Benchmark TLS key exchange methods\0" +/* 2844 */ "BENCHMARK_TLS_KX\0" +/* 2861 */ "benchmark-tls-kx\0" +/* 2878 */ "Benchmark TLS ciphers\0" +/* 2900 */ "BENCHMARK_TLS_CIPHERS\0" +/* 2922 */ "benchmark-tls-ciphers\0" +/* 2944 */ "Print a list of the supported algorithms and modes\0" +/* 2995 */ "LIST\0" +/* 3000 */ "list\0" +/* 3005 */ "Don't allow session tickets\0" +/* 3033 */ "NOTICKET\0" +/* 3042 */ "noticket\0" +/* 3051 */ "Offer SRTP profiles\0" +/* 3071 */ "SRTP_PROFILES\0" +/* 3085 */ "srtp-profiles\0" +/* 3099 */ "Application layer protocol\0" +/* 3126 */ "ALPN\0" +/* 3131 */ "alpn\0" +/* 3136 */ "Activate heartbeat support\0" +/* 3163 */ "HEARTBEAT\0" +/* 3173 */ "heartbeat\0" +/* 3183 */ "The maximum record size to advertize\0" +/* 3220 */ "RECORDSIZE\0" +/* 3231 */ "recordsize\0" +/* 3242 */ "Do not send a Server Name Indication (SNI)\0" +/* 3285 */ "DISABLE_SNI\0" +/* 3297 */ "disable-sni\0" +/* 3309 */ "Disable all the TLS extensions\0" +/* 3340 */ "DISABLE_EXTENSIONS\0" +/* 3359 */ "disable-extensions\0" +/* 3378 */ "Inline commands of the form ^^\0" +/* 3414 */ "INLINE_COMMANDS\0" +/* 3430 */ "inline-commands\0" +/* 3446 */ "Change the default (^) used as a delimiter for inline commands. The\n" + "value is a single US-ASCII character (octets 0 - 127).\0" +/* 3570 */ "INLINE_COMMANDS_PREFIX\0" +/* 3593 */ "inline-commands-prefix\0" +/* 3616 */ "Display extended usage information and exit\0" +/* 3660 */ "help\0" +/* 3665 */ "Extended usage information passed thru pager\0" +/* 3710 */ "more-help\0" +/* 3720 */ "Output version information and exit\0" +/* 3756 */ "version\0" +/* 3764 */ "GNUTLS_CLI\0" +/* 3775 */ "gnutls-cli - GnuTLS client - Ver. @VERSION@\n" + "USAGE: %s [ - [] | --[{=| }] ]... [hostname]\n\0" +/* 3888 */ "bug-gnutls@gnu.org\0" +/* 3907 */ "\n\n\0" +/* 3910 */ "\n" + "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" -/* 3833 */ "gnutls-cli @VERSION@\0" -/* 3854 */ "Usage: gnutls-cli [options] hostname\n" +/* 4094 */ "gnutls-cli @VERSION@\0" +/* 4115 */ "Usage: gnutls-cli [options] hostname\n" "gnutls-cli --help for usage instructions.\n"; -/** +/* * debug option description: */ -/** 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_DESC (gnutls_cli_opt_strs+890) +#define DEBUG_NAME (gnutls_cli_opt_strs+908) +#define DEBUG_name (gnutls_cli_opt_strs+914) #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) -/** +/* * verbose option description: */ -/** 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_DESC (gnutls_cli_opt_strs+920) +#define VERBOSE_NAME (gnutls_cli_opt_strs+940) +#define VERBOSE_name (gnutls_cli_opt_strs+948) #define VERBOSE_FLAGS (OPTST_DISABLED) -/** +/* * tofu option description: */ -/** 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_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) #define TOFU_name (NOT_TOFU_name + 3) -/** Compiled in flag settings for the tofu option */ #define TOFU_FLAGS (OPTST_DISABLED) -/** +/* * dane option description: */ -/** 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_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) #define DANE_name (NOT_DANE_name + 3) -/** Compiled in flag settings for the dane option */ #define DANE_FLAGS (OPTST_DISABLED) -/** +/* * local-dns option description: */ -/** 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_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) #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: */ -/** 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_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) #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: */ -/** 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_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) #define OCSP_name (NOT_OCSP_name + 3) -/** Compiled in flag settings for the ocsp option */ #define OCSP_FLAGS (OPTST_DISABLED) -/** +/* * resume option description: */ -/** 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_DESC (gnutls_cli_opt_strs+1263) +#define RESUME_NAME (gnutls_cli_opt_strs+1294) +#define RESUME_name (gnutls_cli_opt_strs+1301) #define RESUME_FLAGS (OPTST_DISABLED) -/** +/* * rehandshake option description: */ -/** Descriptive text for the rehandshake option */ -#define REHANDSHAKE_DESC (gnutls_cli_opt_strs+1304) -/** Upper-cased name for the rehandshake option */ -#define REHANDSHAKE_NAME (gnutls_cli_opt_strs+1340) -/** Name string for the rehandshake option */ -#define REHANDSHAKE_name (gnutls_cli_opt_strs+1352) -/** Compiled in flag settings for the rehandshake option */ +#define REHANDSHAKE_DESC (gnutls_cli_opt_strs+1308) +#define REHANDSHAKE_NAME (gnutls_cli_opt_strs+1344) +#define REHANDSHAKE_name (gnutls_cli_opt_strs+1356) #define REHANDSHAKE_FLAGS (OPTST_DISABLED) -/** +/* * starttls option description: */ -/** Descriptive text for the starttls option */ -#define STARTTLS_DESC (gnutls_cli_opt_strs+1364) -/** Upper-cased name for the starttls option */ -#define STARTTLS_NAME (gnutls_cli_opt_strs+1414) -/** Name string for the starttls option */ -#define STARTTLS_name (gnutls_cli_opt_strs+1423) -/** Compiled in flag settings for the starttls option */ +#define STARTTLS_DESC (gnutls_cli_opt_strs+1368) +#define STARTTLS_NAME (gnutls_cli_opt_strs+1418) +#define STARTTLS_name (gnutls_cli_opt_strs+1427) #define STARTTLS_FLAGS (OPTST_DISABLED) -/** +/* * udp option description: */ -/** Descriptive text for the udp option */ -#define UDP_DESC (gnutls_cli_opt_strs+1432) -/** Upper-cased name for the udp option */ -#define UDP_NAME (gnutls_cli_opt_strs+1465) -/** Name string for the udp option */ -#define UDP_name (gnutls_cli_opt_strs+1469) -/** Compiled in flag settings for the udp option */ +#define UDP_DESC (gnutls_cli_opt_strs+1436) +#define UDP_NAME (gnutls_cli_opt_strs+1469) +#define UDP_name (gnutls_cli_opt_strs+1473) #define UDP_FLAGS (OPTST_DISABLED) -/** +/* * mtu option description: */ -/** Descriptive text for the mtu option */ -#define MTU_DESC (gnutls_cli_opt_strs+1473) -/** Upper-cased name for the mtu option */ -#define MTU_NAME (gnutls_cli_opt_strs+1498) -/** Name string for the mtu option */ -#define MTU_name (gnutls_cli_opt_strs+1502) -/** Compiled in flag settings for the mtu option */ +#define MTU_DESC (gnutls_cli_opt_strs+1477) +#define MTU_NAME (gnutls_cli_opt_strs+1502) +#define MTU_name (gnutls_cli_opt_strs+1506) #define MTU_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) -/** +/* * crlf option description: */ -/** Descriptive text for the crlf option */ -#define CRLF_DESC (gnutls_cli_opt_strs+1506) -/** Upper-cased name for the crlf option */ -#define CRLF_NAME (gnutls_cli_opt_strs+1531) -/** Name string for the crlf option */ -#define CRLF_name (gnutls_cli_opt_strs+1536) -/** Compiled in flag settings for the crlf option */ +#define CRLF_DESC (gnutls_cli_opt_strs+1510) +#define CRLF_NAME (gnutls_cli_opt_strs+1535) +#define CRLF_name (gnutls_cli_opt_strs+1540) #define CRLF_FLAGS (OPTST_DISABLED) -/** +/* * x509fmtder option description: */ -/** Descriptive text for the x509fmtder option */ -#define X509FMTDER_DESC (gnutls_cli_opt_strs+1541) -/** Upper-cased name for the x509fmtder option */ -#define X509FMTDER_NAME (gnutls_cli_opt_strs+1586) -/** Name string for the x509fmtder option */ -#define X509FMTDER_name (gnutls_cli_opt_strs+1597) -/** Compiled in flag settings for the x509fmtder option */ +#define X509FMTDER_DESC (gnutls_cli_opt_strs+1545) +#define X509FMTDER_NAME (gnutls_cli_opt_strs+1590) +#define X509FMTDER_name (gnutls_cli_opt_strs+1601) #define X509FMTDER_FLAGS (OPTST_DISABLED) -/** +/* * fingerprint option description: */ -/** Descriptive text for the fingerprint option */ -#define FINGERPRINT_DESC (gnutls_cli_opt_strs+1608) -/** Upper-cased name for the fingerprint option */ -#define FINGERPRINT_NAME (gnutls_cli_opt_strs+1657) -/** Name string for the fingerprint option */ -#define FINGERPRINT_name (gnutls_cli_opt_strs+1669) -/** Compiled in flag settings for the fingerprint option */ +#define FINGERPRINT_DESC (gnutls_cli_opt_strs+1612) +#define FINGERPRINT_NAME (gnutls_cli_opt_strs+1661) +#define FINGERPRINT_name (gnutls_cli_opt_strs+1673) #define FINGERPRINT_FLAGS (OPTST_DISABLED) -/** +/* * print-cert option description: */ -/** Descriptive text for the print-cert option */ -#define PRINT_CERT_DESC (gnutls_cli_opt_strs+1681) -/** Upper-cased name for the print-cert option */ -#define PRINT_CERT_NAME (gnutls_cli_opt_strs+1720) -/** Name string for the print-cert option */ -#define PRINT_CERT_name (gnutls_cli_opt_strs+1731) -/** Compiled in flag settings for the print-cert option */ +#define PRINT_CERT_DESC (gnutls_cli_opt_strs+1685) +#define PRINT_CERT_NAME (gnutls_cli_opt_strs+1724) +#define PRINT_CERT_name (gnutls_cli_opt_strs+1735) #define PRINT_CERT_FLAGS (OPTST_DISABLED) -/** +/* * dh-bits option description: */ -/** Descriptive text for the dh-bits option */ -#define DH_BITS_DESC (gnutls_cli_opt_strs+1742) -/** Upper-cased name for the dh-bits option */ -#define DH_BITS_NAME (gnutls_cli_opt_strs+1784) -/** Name string for the dh-bits option */ -#define DH_BITS_name (gnutls_cli_opt_strs+1792) -/** Compiled in flag settings for the dh-bits option */ +#define DH_BITS_DESC (gnutls_cli_opt_strs+1746) +#define DH_BITS_NAME (gnutls_cli_opt_strs+1788) +#define DH_BITS_name (gnutls_cli_opt_strs+1796) #define DH_BITS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) -/** +/* * priority option description: */ -/** Descriptive text for the priority option */ -#define PRIORITY_DESC (gnutls_cli_opt_strs+1800) -/** Upper-cased name for the priority option */ -#define PRIORITY_NAME (gnutls_cli_opt_strs+1818) -/** Name string for the priority option */ -#define PRIORITY_name (gnutls_cli_opt_strs+1827) -/** Compiled in flag settings for the priority option */ +#define PRIORITY_DESC (gnutls_cli_opt_strs+1804) +#define PRIORITY_NAME (gnutls_cli_opt_strs+1822) +#define PRIORITY_name (gnutls_cli_opt_strs+1831) #define PRIORITY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * x509cafile option description: */ -/** Descriptive text for the x509cafile option */ -#define X509CAFILE_DESC (gnutls_cli_opt_strs+1836) -/** Upper-cased name for the x509cafile option */ -#define X509CAFILE_NAME (gnutls_cli_opt_strs+1876) -/** Name string for the x509cafile option */ -#define X509CAFILE_name (gnutls_cli_opt_strs+1887) -/** Compiled in flag settings for the x509cafile option */ +#define X509CAFILE_DESC (gnutls_cli_opt_strs+1840) +#define X509CAFILE_NAME (gnutls_cli_opt_strs+1880) +#define X509CAFILE_name (gnutls_cli_opt_strs+1891) #define X509CAFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * x509crlfile option description: */ -/** Descriptive text for the x509crlfile option */ -#define X509CRLFILE_DESC (gnutls_cli_opt_strs+1898) -/** Upper-cased name for the x509crlfile option */ -#define X509CRLFILE_NAME (gnutls_cli_opt_strs+1914) -/** Name string for the x509crlfile option */ -#define X509CRLFILE_name (gnutls_cli_opt_strs+1926) -/** Compiled in flag settings for the x509crlfile option */ +#define X509CRLFILE_DESC (gnutls_cli_opt_strs+1902) +#define X509CRLFILE_NAME (gnutls_cli_opt_strs+1918) +#define X509CRLFILE_name (gnutls_cli_opt_strs+1930) #define X509CRLFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) -/** +/* * pgpkeyfile option description: */ -/** Descriptive text for the pgpkeyfile option */ -#define PGPKEYFILE_DESC (gnutls_cli_opt_strs+1938) -/** Upper-cased name for the pgpkeyfile option */ -#define PGPKEYFILE_NAME (gnutls_cli_opt_strs+1958) -/** Name string for the pgpkeyfile option */ -#define PGPKEYFILE_name (gnutls_cli_opt_strs+1969) -/** Compiled in flag settings for the pgpkeyfile option */ +#define PGPKEYFILE_DESC (gnutls_cli_opt_strs+1942) +#define PGPKEYFILE_NAME (gnutls_cli_opt_strs+1962) +#define PGPKEYFILE_name (gnutls_cli_opt_strs+1973) #define PGPKEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) -/** +/* * pgpkeyring option description: */ -/** Descriptive text for the pgpkeyring option */ -#define PGPKEYRING_DESC (gnutls_cli_opt_strs+1980) -/** Upper-cased name for the pgpkeyring option */ -#define PGPKEYRING_NAME (gnutls_cli_opt_strs+2005) -/** Name string for the pgpkeyring option */ -#define PGPKEYRING_name (gnutls_cli_opt_strs+2016) -/** Compiled in flag settings for the pgpkeyring option */ +#define PGPKEYRING_DESC (gnutls_cli_opt_strs+1984) +#define PGPKEYRING_NAME (gnutls_cli_opt_strs+2009) +#define PGPKEYRING_name (gnutls_cli_opt_strs+2020) #define PGPKEYRING_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) -/** +/* * pgpcertfile option description: */ -/** Descriptive text for the pgpcertfile option */ -#define PGPCERTFILE_DESC (gnutls_cli_opt_strs+2027) -/** Upper-cased name for the pgpcertfile option */ -#define PGPCERTFILE_NAME (gnutls_cli_opt_strs+2068) -/** Name string for the pgpcertfile option */ -#define PGPCERTFILE_name (gnutls_cli_opt_strs+2080) -/** Compiled in flag settings for the pgpcertfile option */ +#define PGPCERTFILE_DESC (gnutls_cli_opt_strs+2031) +#define PGPCERTFILE_NAME (gnutls_cli_opt_strs+2072) +#define PGPCERTFILE_name (gnutls_cli_opt_strs+2084) #define PGPCERTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) -/** +/* * x509keyfile option description: */ -/** Descriptive text for the x509keyfile option */ -#define X509KEYFILE_DESC (gnutls_cli_opt_strs+2092) -/** Upper-cased name for the x509keyfile option */ -#define X509KEYFILE_NAME (gnutls_cli_opt_strs+2130) -/** Name string for the x509keyfile option */ -#define X509KEYFILE_name (gnutls_cli_opt_strs+2142) -/** Compiled in flag settings for the x509keyfile option */ +#define X509KEYFILE_DESC (gnutls_cli_opt_strs+2096) +#define X509KEYFILE_NAME (gnutls_cli_opt_strs+2134) +#define X509KEYFILE_name (gnutls_cli_opt_strs+2146) #define X509KEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * x509certfile option description: */ -/** Descriptive text for the x509certfile option */ -#define X509CERTFILE_DESC (gnutls_cli_opt_strs+2154) -/** Upper-cased name for the x509certfile option */ -#define X509CERTFILE_NAME (gnutls_cli_opt_strs+2200) -/** Name string for the x509certfile option */ -#define X509CERTFILE_name (gnutls_cli_opt_strs+2213) -/** Compiled in flag settings for the x509certfile option */ +#define X509CERTFILE_DESC (gnutls_cli_opt_strs+2158) +#define X509CERTFILE_NAME (gnutls_cli_opt_strs+2204) +#define X509CERTFILE_name (gnutls_cli_opt_strs+2217) #define X509CERTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * pgpsubkey option description: */ -/** Descriptive text for the pgpsubkey option */ -#define PGPSUBKEY_DESC (gnutls_cli_opt_strs+2226) -/** Upper-cased name for the pgpsubkey option */ -#define PGPSUBKEY_NAME (gnutls_cli_opt_strs+2258) -/** Name string for the pgpsubkey option */ -#define PGPSUBKEY_name (gnutls_cli_opt_strs+2268) -/** Compiled in flag settings for the pgpsubkey option */ +#define PGPSUBKEY_DESC (gnutls_cli_opt_strs+2230) +#define PGPSUBKEY_NAME (gnutls_cli_opt_strs+2262) +#define PGPSUBKEY_name (gnutls_cli_opt_strs+2272) #define PGPSUBKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * srpusername option description: */ -/** Descriptive text for the srpusername option */ -#define SRPUSERNAME_DESC (gnutls_cli_opt_strs+2278) -/** Upper-cased name for the srpusername option */ -#define SRPUSERNAME_NAME (gnutls_cli_opt_strs+2298) -/** Name string for the srpusername option */ -#define SRPUSERNAME_name (gnutls_cli_opt_strs+2310) -/** Compiled in flag settings for the srpusername option */ +#define SRPUSERNAME_DESC (gnutls_cli_opt_strs+2282) +#define SRPUSERNAME_NAME (gnutls_cli_opt_strs+2302) +#define SRPUSERNAME_name (gnutls_cli_opt_strs+2314) #define SRPUSERNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * srppasswd option description: */ -/** Descriptive text for the srppasswd option */ -#define SRPPASSWD_DESC (gnutls_cli_opt_strs+2322) -/** Upper-cased name for the srppasswd option */ -#define SRPPASSWD_NAME (gnutls_cli_opt_strs+2342) -/** Name string for the srppasswd option */ -#define SRPPASSWD_name (gnutls_cli_opt_strs+2352) -/** Compiled in flag settings for the srppasswd option */ +#define SRPPASSWD_DESC (gnutls_cli_opt_strs+2326) +#define SRPPASSWD_NAME (gnutls_cli_opt_strs+2346) +#define SRPPASSWD_name (gnutls_cli_opt_strs+2356) #define SRPPASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * pskusername option description: */ -/** Descriptive text for the pskusername option */ -#define PSKUSERNAME_DESC (gnutls_cli_opt_strs+2362) -/** Upper-cased name for the pskusername option */ -#define PSKUSERNAME_NAME (gnutls_cli_opt_strs+2382) -/** Name string for the pskusername option */ -#define PSKUSERNAME_name (gnutls_cli_opt_strs+2394) -/** Compiled in flag settings for the pskusername option */ +#define PSKUSERNAME_DESC (gnutls_cli_opt_strs+2366) +#define PSKUSERNAME_NAME (gnutls_cli_opt_strs+2386) +#define PSKUSERNAME_name (gnutls_cli_opt_strs+2398) #define PSKUSERNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * pskkey option description: */ -/** Descriptive text for the pskkey option */ -#define PSKKEY_DESC (gnutls_cli_opt_strs+2406) -/** Upper-cased name for the pskkey option */ -#define PSKKEY_NAME (gnutls_cli_opt_strs+2430) -/** Name string for the pskkey option */ -#define PSKKEY_name (gnutls_cli_opt_strs+2437) -/** Compiled in flag settings for the pskkey option */ +#define PSKKEY_DESC (gnutls_cli_opt_strs+2410) +#define PSKKEY_NAME (gnutls_cli_opt_strs+2434) +#define PSKKEY_name (gnutls_cli_opt_strs+2441) #define PSKKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * port option description: */ -/** Descriptive text for the port option */ -#define PORT_DESC (gnutls_cli_opt_strs+2444) -/** Upper-cased name for the port option */ -#define PORT_NAME (gnutls_cli_opt_strs+2478) -/** Name string for the port option */ -#define PORT_name (gnutls_cli_opt_strs+2483) -/** Compiled in flag settings for the port option */ +#define PORT_DESC (gnutls_cli_opt_strs+2448) +#define PORT_NAME (gnutls_cli_opt_strs+2482) +#define PORT_name (gnutls_cli_opt_strs+2487) #define PORT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * insecure option description: */ -/** Descriptive text for the insecure option */ -#define INSECURE_DESC (gnutls_cli_opt_strs+2488) -/** Upper-cased name for the insecure option */ -#define INSECURE_NAME (gnutls_cli_opt_strs+2549) -/** Name string for the insecure option */ -#define INSECURE_name (gnutls_cli_opt_strs+2558) -/** Compiled in flag settings for the insecure option */ +#define INSECURE_DESC (gnutls_cli_opt_strs+2492) +#define INSECURE_NAME (gnutls_cli_opt_strs+2553) +#define INSECURE_name (gnutls_cli_opt_strs+2562) #define INSECURE_FLAGS (OPTST_DISABLED) -/** +/* * ranges option description: */ -/** Descriptive text for the ranges option */ -#define RANGES_DESC (gnutls_cli_opt_strs+2567) -/** Upper-cased name for the ranges option */ -#define RANGES_NAME (gnutls_cli_opt_strs+2621) -/** Name string for the ranges option */ -#define RANGES_name (gnutls_cli_opt_strs+2628) -/** Compiled in flag settings for the ranges option */ +#define RANGES_DESC (gnutls_cli_opt_strs+2571) +#define RANGES_NAME (gnutls_cli_opt_strs+2625) +#define RANGES_name (gnutls_cli_opt_strs+2632) #define RANGES_FLAGS (OPTST_DISABLED) -/** +/* * benchmark-ciphers option description: */ -/** Descriptive text for the benchmark-ciphers option */ -#define BENCHMARK_CIPHERS_DESC (gnutls_cli_opt_strs+2635) -/** Upper-cased name for the benchmark-ciphers option */ -#define BENCHMARK_CIPHERS_NAME (gnutls_cli_opt_strs+2664) -/** Name string for the benchmark-ciphers option */ -#define BENCHMARK_CIPHERS_name (gnutls_cli_opt_strs+2682) -/** Compiled in flag settings for the benchmark-ciphers option */ +#define BENCHMARK_CIPHERS_DESC (gnutls_cli_opt_strs+2639) +#define BENCHMARK_CIPHERS_NAME (gnutls_cli_opt_strs+2668) +#define BENCHMARK_CIPHERS_name (gnutls_cli_opt_strs+2686) #define BENCHMARK_CIPHERS_FLAGS (OPTST_DISABLED) -/** +/* * benchmark-soft-ciphers option description: */ -/** Descriptive text for the benchmark-soft-ciphers option */ -#define BENCHMARK_SOFT_CIPHERS_DESC (gnutls_cli_opt_strs+2700) -/** Upper-cased name for the benchmark-soft-ciphers option */ -#define BENCHMARK_SOFT_CIPHERS_NAME (gnutls_cli_opt_strs+2759) -/** Name string for the benchmark-soft-ciphers option */ -#define BENCHMARK_SOFT_CIPHERS_name (gnutls_cli_opt_strs+2782) -/** Compiled in flag settings for the benchmark-soft-ciphers option */ +#define BENCHMARK_SOFT_CIPHERS_DESC (gnutls_cli_opt_strs+2704) +#define BENCHMARK_SOFT_CIPHERS_NAME (gnutls_cli_opt_strs+2763) +#define BENCHMARK_SOFT_CIPHERS_name (gnutls_cli_opt_strs+2786) #define BENCHMARK_SOFT_CIPHERS_FLAGS (OPTST_DISABLED) -/** +/* * benchmark-tls-kx option description: */ -/** Descriptive text for the benchmark-tls-kx option */ -#define BENCHMARK_TLS_KX_DESC (gnutls_cli_opt_strs+2805) -/** Upper-cased name for the benchmark-tls-kx option */ -#define BENCHMARK_TLS_KX_NAME (gnutls_cli_opt_strs+2840) -/** Name string for the benchmark-tls-kx option */ -#define BENCHMARK_TLS_KX_name (gnutls_cli_opt_strs+2857) -/** Compiled in flag settings for the benchmark-tls-kx option */ +#define BENCHMARK_TLS_KX_DESC (gnutls_cli_opt_strs+2809) +#define BENCHMARK_TLS_KX_NAME (gnutls_cli_opt_strs+2844) +#define BENCHMARK_TLS_KX_name (gnutls_cli_opt_strs+2861) #define BENCHMARK_TLS_KX_FLAGS (OPTST_DISABLED) -/** +/* * benchmark-tls-ciphers option description: */ -/** Descriptive text for the benchmark-tls-ciphers option */ -#define BENCHMARK_TLS_CIPHERS_DESC (gnutls_cli_opt_strs+2874) -/** Upper-cased name for the benchmark-tls-ciphers option */ -#define BENCHMARK_TLS_CIPHERS_NAME (gnutls_cli_opt_strs+2896) -/** Name string for the benchmark-tls-ciphers option */ -#define BENCHMARK_TLS_CIPHERS_name (gnutls_cli_opt_strs+2918) -/** Compiled in flag settings for the benchmark-tls-ciphers option */ +#define BENCHMARK_TLS_CIPHERS_DESC (gnutls_cli_opt_strs+2878) +#define BENCHMARK_TLS_CIPHERS_NAME (gnutls_cli_opt_strs+2900) +#define BENCHMARK_TLS_CIPHERS_name (gnutls_cli_opt_strs+2922) #define BENCHMARK_TLS_CIPHERS_FLAGS (OPTST_DISABLED) -/** +/* * list option description: */ -/** Descriptive text for the list option */ -#define LIST_DESC (gnutls_cli_opt_strs+2940) -/** Upper-cased name for the list option */ -#define LIST_NAME (gnutls_cli_opt_strs+2991) -/** Name string for the list option */ -#define LIST_name (gnutls_cli_opt_strs+2996) -/** Compiled in flag settings for the list option */ +#define LIST_DESC (gnutls_cli_opt_strs+2944) +#define LIST_NAME (gnutls_cli_opt_strs+2995) +#define LIST_name (gnutls_cli_opt_strs+3000) #define LIST_FLAGS (OPTST_DISABLED) -/** +/* * noticket option description: */ -/** Descriptive text for the noticket option */ -#define NOTICKET_DESC (gnutls_cli_opt_strs+3001) -/** Upper-cased name for the noticket option */ -#define NOTICKET_NAME (gnutls_cli_opt_strs+3029) -/** Name string for the noticket option */ -#define NOTICKET_name (gnutls_cli_opt_strs+3038) -/** Compiled in flag settings for the noticket option */ +#define NOTICKET_DESC (gnutls_cli_opt_strs+3005) +#define NOTICKET_NAME (gnutls_cli_opt_strs+3033) +#define NOTICKET_name (gnutls_cli_opt_strs+3042) #define NOTICKET_FLAGS (OPTST_DISABLED) -/** +/* * srtp_profiles option description: */ -/** Descriptive text for the srtp_profiles option */ -#define SRTP_PROFILES_DESC (gnutls_cli_opt_strs+3047) -/** Upper-cased name for the srtp_profiles option */ -#define SRTP_PROFILES_NAME (gnutls_cli_opt_strs+3067) -/** Name string for the srtp_profiles option */ -#define SRTP_PROFILES_name (gnutls_cli_opt_strs+3081) -/** Compiled in flag settings for the srtp_profiles option */ +#define SRTP_PROFILES_DESC (gnutls_cli_opt_strs+3051) +#define SRTP_PROFILES_NAME (gnutls_cli_opt_strs+3071) +#define SRTP_PROFILES_name (gnutls_cli_opt_strs+3085) #define SRTP_PROFILES_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * alpn option description: */ -/** Descriptive text for the alpn option */ -#define ALPN_DESC (gnutls_cli_opt_strs+3095) -/** Upper-cased name for the alpn option */ -#define ALPN_NAME (gnutls_cli_opt_strs+3122) -/** Name string for the alpn option */ -#define ALPN_name (gnutls_cli_opt_strs+3127) -/** Compiled in flag settings for the alpn option */ +#define ALPN_DESC (gnutls_cli_opt_strs+3099) +#define ALPN_NAME (gnutls_cli_opt_strs+3126) +#define ALPN_name (gnutls_cli_opt_strs+3131) #define ALPN_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/** +/* * heartbeat option description: */ -/** Descriptive text for the heartbeat option */ -#define HEARTBEAT_DESC (gnutls_cli_opt_strs+3132) -/** Upper-cased name for the heartbeat option */ -#define HEARTBEAT_NAME (gnutls_cli_opt_strs+3159) -/** Name string for the heartbeat option */ -#define HEARTBEAT_name (gnutls_cli_opt_strs+3169) -/** Compiled in flag settings for the heartbeat option */ +#define HEARTBEAT_DESC (gnutls_cli_opt_strs+3136) +#define HEARTBEAT_NAME (gnutls_cli_opt_strs+3163) +#define HEARTBEAT_name (gnutls_cli_opt_strs+3173) #define HEARTBEAT_FLAGS (OPTST_DISABLED) -/** +/* * recordsize option description: */ -/** Descriptive text for the recordsize option */ -#define RECORDSIZE_DESC (gnutls_cli_opt_strs+3179) -/** Upper-cased name for the recordsize option */ -#define RECORDSIZE_NAME (gnutls_cli_opt_strs+3216) -/** Name string for the recordsize option */ -#define RECORDSIZE_name (gnutls_cli_opt_strs+3227) -/** Compiled in flag settings for the recordsize option */ +#define RECORDSIZE_DESC (gnutls_cli_opt_strs+3183) +#define RECORDSIZE_NAME (gnutls_cli_opt_strs+3220) +#define RECORDSIZE_name (gnutls_cli_opt_strs+3231) #define RECORDSIZE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) -/** +/* * disable-sni option description: */ -/** Descriptive text for the disable-sni option */ -#define DISABLE_SNI_DESC (gnutls_cli_opt_strs+3238) -/** Upper-cased name for the disable-sni option */ -#define DISABLE_SNI_NAME (gnutls_cli_opt_strs+3281) -/** Name string for the disable-sni option */ -#define DISABLE_SNI_name (gnutls_cli_opt_strs+3293) -/** Compiled in flag settings for the disable-sni option */ +#define DISABLE_SNI_DESC (gnutls_cli_opt_strs+3242) +#define DISABLE_SNI_NAME (gnutls_cli_opt_strs+3285) +#define DISABLE_SNI_name (gnutls_cli_opt_strs+3297) #define DISABLE_SNI_FLAGS (OPTST_DISABLED) -/** +/* * disable-extensions option description: */ -/** Descriptive text for the disable-extensions option */ -#define DISABLE_EXTENSIONS_DESC (gnutls_cli_opt_strs+3305) -/** Upper-cased name for the disable-extensions option */ -#define DISABLE_EXTENSIONS_NAME (gnutls_cli_opt_strs+3336) -/** Name string for the disable-extensions option */ -#define DISABLE_EXTENSIONS_name (gnutls_cli_opt_strs+3355) -/** Compiled in flag settings for the disable-extensions option */ +#define DISABLE_EXTENSIONS_DESC (gnutls_cli_opt_strs+3309) +#define DISABLE_EXTENSIONS_NAME (gnutls_cli_opt_strs+3340) +#define DISABLE_EXTENSIONS_name (gnutls_cli_opt_strs+3359) #define DISABLE_EXTENSIONS_FLAGS (OPTST_DISABLED) +/* + * inline-commands option description: + */ +#define INLINE_COMMANDS_DESC (gnutls_cli_opt_strs+3378) +#define INLINE_COMMANDS_NAME (gnutls_cli_opt_strs+3414) +#define INLINE_COMMANDS_name (gnutls_cli_opt_strs+3430) +#define INLINE_COMMANDS_FLAGS (OPTST_DISABLED) + +/* + * inline-commands-prefix option description: + */ +#define INLINE_COMMANDS_PREFIX_DESC (gnutls_cli_opt_strs+3446) +#define INLINE_COMMANDS_PREFIX_NAME (gnutls_cli_opt_strs+3570) +#define INLINE_COMMANDS_PREFIX_name (gnutls_cli_opt_strs+3593) +#define INLINE_COMMANDS_PREFIX_FLAGS (OPTST_DISABLED \ + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (gnutls_cli_opt_strs+3374) -#define HELP_name (gnutls_cli_opt_strs+3418) +#define HELP_DESC (gnutls_cli_opt_strs+3616) +#define HELP_name (gnutls_cli_opt_strs+3660) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (gnutls_cli_opt_strs+3423) -#define MORE_HELP_name (gnutls_cli_opt_strs+3468) +#define MORE_HELP_DESC (gnutls_cli_opt_strs+3665) +#define MORE_HELP_name (gnutls_cli_opt_strs+3710) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC NULL @@ -833,9 +673,9 @@ static char const gnutls_cli_opt_strs[3934] = # 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+3478) -#define VER_name (gnutls_cli_opt_strs+3514) -/** +#define VER_DESC (gnutls_cli_opt_strs+3720) +#define VER_name (gnutls_cli_opt_strs+3756) +/* * Declare option callback procedures */ extern tOptProc @@ -1395,11 +1235,35 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ DISABLE_EXTENSIONS_DESC, DISABLE_EXTENSIONS_NAME, DISABLE_EXTENSIONS_name, /* disablement strs */ NULL, NULL }, + { /* entry idx, value */ 45, VALUE_OPT_INLINE_COMMANDS, + /* equiv idx, value */ 45, VALUE_OPT_INLINE_COMMANDS, + /* equivalenced to */ NO_EQUIVALENT, + /* min, max, act ct */ 0, 1, 0, + /* opt state flags */ INLINE_COMMANDS_FLAGS, 0, + /* last opt argumnt */ { NULL }, /* --inline-commands */ + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, NULL, + /* option proc */ NULL, + /* desc, NAME, name */ INLINE_COMMANDS_DESC, INLINE_COMMANDS_NAME, INLINE_COMMANDS_name, + /* disablement strs */ NULL, NULL }, + + { /* entry idx, value */ 46, VALUE_OPT_INLINE_COMMANDS_PREFIX, + /* equiv idx, value */ 46, VALUE_OPT_INLINE_COMMANDS_PREFIX, + /* equivalenced to */ NO_EQUIVALENT, + /* min, max, act ct */ 0, 1, 0, + /* opt state flags */ INLINE_COMMANDS_PREFIX_FLAGS, 0, + /* last opt argumnt */ { NULL }, /* --inline-commands-prefix */ + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, NULL, + /* option proc */ NULL, + /* desc, NAME, name */ INLINE_COMMANDS_PREFIX_DESC, INLINE_COMMANDS_PREFIX_NAME, INLINE_COMMANDS_PREFIX_name, + /* disablement strs */ NULL, NULL }, + { /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION, /* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_VERSION, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ VER_FLAGS, AOUSE_VERSION, + /* opt state flags */ VER_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -1413,7 +1277,7 @@ static tOptDesc optDesc[OPTION_CT] = { /* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_HELP, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP, + /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -1425,7 +1289,7 @@ static tOptDesc optDesc[OPTION_CT] = { /* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_MORE_HELP, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ MORE_HELP_FLAGS, AOUSE_MORE_HELP, + /* opt state flags */ MORE_HELP_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -1435,24 +1299,19 @@ static tOptDesc optDesc[OPTION_CT] = { }; -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/** Reference to the upper cased version of gnutls-cli. */ -#define zPROGNAME (gnutls_cli_opt_strs+3522) -/** Reference to the title line for gnutls-cli usage. */ -#define zUsageTitle (gnutls_cli_opt_strs+3533) -/** There is no gnutls-cli configuration file. */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Define the gnutls-cli Option Environment + */ +#define zPROGNAME (gnutls_cli_opt_strs+3764) +#define zUsageTitle (gnutls_cli_opt_strs+3775) #define zRcName NULL -/** There are no directories to search for gnutls-cli config files. */ #define apzHomeList NULL -/** The gnutls-cli program bug email address. */ -#define zBugsAddr (gnutls_cli_opt_strs+3629) -/** Clarification/explanation of what gnutls-cli does. */ -#define zExplain (gnutls_cli_opt_strs+3648) -/** Extra detail explaining what gnutls-cli does. */ -#define zDetail (gnutls_cli_opt_strs+3650) -/** The full version string for gnutls-cli. */ -#define zFullVersion (gnutls_cli_opt_strs+3833) -/* extracted from optcode.tlib near line 371 */ +#define zBugsAddr (gnutls_cli_opt_strs+3888) +#define zExplain (gnutls_cli_opt_strs+3907) +#define zDetail (gnutls_cli_opt_strs+3910) +#define zFullVersion (gnutls_cli_opt_strs+4094) +/* extracted from optcode.tlib near line 353 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT @@ -1462,8 +1321,10 @@ 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+3854) + +#define gnutls_cli_short_usage (gnutls_cli_opt_strs+4115) #endif /* not defined __doxygen__ */ @@ -1473,8 +1334,8 @@ static tOptDesc optDesc[OPTION_CT] = { /** * The callout function that invokes the optionUsage function. * - * @param[in] pOptions the AutoOpts option description structure - * @param[in] pOptDesc the descriptor for the "help" (usage) option. + * @param pOptions the AutoOpts option description structure + * @param pOptDesc the descriptor for the "help" (usage) option. * @noreturn */ static void @@ -1489,9 +1350,9 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** * Code to handle the debug option. - * Specifies the debug level. - * @param[in] pOptions the gnutls-cli options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * + * @param pOptions the gnutls-cli options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1525,8 +1386,8 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc) /** * Code to handle the mtu option. * - * @param[in] pOptions the gnutls-cli options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * @param pOptions the gnutls-cli options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptMtu(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1560,8 +1421,8 @@ doOptMtu(tOptions* pOptions, tOptDesc* pOptDesc) /** * Code to handle the x509crlfile option. * - * @param[in] pOptions the gnutls-cli options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * @param pOptions the gnutls-cli options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptX509crlfile(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1584,8 +1445,8 @@ doOptX509crlfile(tOptions* pOptions, tOptDesc* pOptDesc) /** * Code to handle the pgpkeyfile option. * - * @param[in] pOptions the gnutls-cli options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * @param pOptions the gnutls-cli options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptPgpkeyfile(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1608,8 +1469,8 @@ doOptPgpkeyfile(tOptions* pOptions, tOptDesc* pOptDesc) /** * Code to handle the pgpkeyring option. * - * @param[in] pOptions the gnutls-cli options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * @param pOptions the gnutls-cli options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptPgpkeyring(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1632,8 +1493,8 @@ doOptPgpkeyring(tOptions* pOptions, tOptDesc* pOptDesc) /** * Code to handle the pgpcertfile option. * - * @param[in] pOptions the gnutls-cli options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * @param pOptions the gnutls-cli options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptPgpcertfile(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1656,8 +1517,8 @@ doOptPgpcertfile(tOptions* pOptions, tOptDesc* pOptDesc) /** * Code to handle the recordsize option. * - * @param[in] pOptions the gnutls-cli options data structure - * @param[in,out] pOptDesc the option descriptor for this option. + * @param pOptions the gnutls-cli options data structure + * @param pOptDesc the option descriptor for this option. */ static void doOptRecordsize(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1686,7 +1547,7 @@ doOptRecordsize(tOptions* pOptions, tOptDesc* pOptDesc) emit_ranges: optionShowRange(pOptions, pOptDesc, (void *)rng, 1); } -/* extracted from optmain.tlib near line 1254 */ +/* extracted from optmain.tlib near line 1188 */ /** * The directory containing the data associated with gnutls-cli. @@ -1702,7 +1563,6 @@ doOptRecordsize(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 @@ -1751,18 +1611,13 @@ tOptions gnutls_cliOptions = { NO_EQUIVALENT, /* '-#' option index */ NO_EQUIVALENT /* index of default opt */ }, - 48 /* full option count */, 45 /* user option count */, + 50 /* full option count */, 47 /* user option count */, gnutls_cli_full_usage, gnutls_cli_short_usage, NULL, NULL, PKGDATADIR, gnutls_cli_packager_info }; #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 #include #include @@ -1841,8 +1696,9 @@ translate_option_strings(void) * Do the translations. The first pointer follows the field count * field. The field count field is the size of a pointer. */ - char ** ppz = (char**)(void*)&(option_xlateable_txt); - int ix = option_xlateable_txt.field_ct; + tOptDesc * od = opts->pOptDesc; + char ** ppz = (char**)(void*)&(option_xlateable_txt); + int ix = option_xlateable_txt.field_ct; do { ppz++; /* skip over field_ct */ @@ -1857,511 +1713,28 @@ translate_option_strings(void) coerce_it((void*)&(opts->pzUsageTitle)); coerce_it((void*)&(opts->pzExplain)); coerce_it((void*)&(opts->pzDetail)); - { - tOptDesc * od = opts->pOptDesc; - for (ix = opts->optCt; ix > 0; ix--, od++) - coerce_it((void*)&(od->pzText)); - } - } -} -#endif /* ENABLE_NLS */ - -#ifdef DO_NOT_COMPILE_THIS_CODE_IT_IS_FOR_GETTEXT -/** I18N function strictly for xgettext. Do not compile. */ -static void bogus_function(void) { - /* TRANSLATORS: - - The following dummy function was crated solely so that xgettext can extract - the correct strings. These strings are actually referenced by a field name - in the 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 \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 .\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(_("Establish a session and rehandshake")); - - /* 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(_("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(_("Print peer's certificate in PEM format")); - - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("The minimum number of bits allowed for DH")); - - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("Priorities string")); + coerce_it((void*)&(opts->pzPackager)); + coerce_it((void*)&(opts->pzShortUsage)); - /* 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")); + for (ix = opts->optCt; ix > 0; ix--, od++) + coerce_it((void*)&(od->pzText)); + } - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("Benchmark individual software ciphers (no hw acceleration)")); + if ((opts->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) { + tOptDesc * od = opts->pOptDesc; + int ix; - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("Benchmark TLS key exchange methods")); + for (ix = opts->optCt; ix > 0; ix--, od++) { + coerce_it((void*)&(od->pz_Name)); + coerce_it((void*)&(od->pz_DisableName)); + coerce_it((void*)&(od->pz_DisablePfx)); + } + gnutls_cliOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT; + } +} - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("Benchmark TLS ciphers")); +#endif /* ENABLE_NLS */ - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("Print a list of the supported algorithms and modes")); - - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("Don't allow session tickets")); - - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("Offer SRTP profiles")); - - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("Application layer protocol")); - - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("Activate heartbeat support")); - - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("The maximum record size to advertize")); - - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("Do not send a Server Name Indication (SNI)")); - - /* referenced via gnutls_cliOptions.pOptDesc->pzText */ - puts(_("Disable all the TLS extensions")); - - /* 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 [ - [] | --[{=| }] ]... [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(_("<<>>")); - - /* 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 '-#' 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 420718cd4e..8b64058cbc 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 May 5, 2013 at 01:00:26 PM by AutoGen 5.17.3 + * + * It has been AutoGen-ed October 4, 2013 at 12:44:10 PM by AutoGen 5.17 * From the definitions cli-args.def * and the template file options * - * Generated from AutoOpts 38:0:13 templates. + * Generated from AutoOpts 37:0:12 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -21,23 +21,24 @@ * * Copyright (C) 2000-2012 Free Software Foundation, all rights reserved. * This is free software. It is licensed for use, modification and - * redistribution under the terms of the GNU General Public License, - * version 3 or later + * redistribution under the terms of the + * GNU General Public License, version 3 or later + * * * 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 . */ -/** +/* * 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 @@ -48,22 +49,22 @@ #include "config.h" #include -/** +/* * Ensure that the library used for compiling this generated header is at * least as new as the version current when the header template was released * (not counting patch version increments). Also ensure that the oldest * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 155648 +#define AO_TEMPLATE_VERSION 151552 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header Choke Me. #endif -/** - * Enumeration of each option type for gnutls-cli +/* + * Enumeration of each option: */ typedef enum { INDEX_OPT_DEBUG = 0, @@ -111,55 +112,40 @@ typedef enum { INDEX_OPT_RECORDSIZE = 42, INDEX_OPT_DISABLE_SNI = 43, INDEX_OPT_DISABLE_EXTENSIONS = 44, - INDEX_OPT_VERSION = 45, - INDEX_OPT_HELP = 46, - INDEX_OPT_MORE_HELP = 47 + INDEX_OPT_INLINE_COMMANDS = 45, + INDEX_OPT_INLINE_COMMANDS_PREFIX = 46, + INDEX_OPT_VERSION = 47, + INDEX_OPT_HELP = 48, + INDEX_OPT_MORE_HELP = 49 } teOptIndex; -/** count of all options for gnutls-cli */ -#define OPTION_CT 48 -/** gnutls-cli version */ + +#define OPTION_CT 50 #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 { @@ -168,10 +154,9 @@ typedef enum { 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' @@ -226,11 +211,10 @@ typedef enum { #define OPT_VALUE_RECORDSIZE (DESC(RECORDSIZE).optArg.argInt) #define VALUE_OPT_DISABLE_SNI 139 #define VALUE_OPT_DISABLE_EXTENSIONS 140 -/** option flag (value) for " (get "val-name") " option */ +#define VALUE_OPT_INLINE_COMMANDS 141 +#define VALUE_OPT_INLINE_COMMANDS_PREFIX 142 #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 @@ -242,7 +226,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 538 */ +/* extracted from opthead.tlib near line 497 */ #ifdef __cplusplus extern "C" {