diff options
Diffstat (limited to 'src/cli-args.c.bak')
-rw-r--r-- | src/cli-args.c.bak | 180 |
1 files changed, 120 insertions, 60 deletions
diff --git a/src/cli-args.c.bak b/src/cli-args.c.bak index 9544d88290..71fa75cc4a 100644 --- a/src/cli-args.c.bak +++ b/src/cli-args.c.bak @@ -63,7 +63,7 @@ extern FILE * option_usage_fp; /** * static const strings for gnutls-cli options */ -static char const gnutls_cli_opt_strs[4929] = +static char const gnutls_cli_opt_strs[5090] = /* 0 */ "gnutls-cli @VERSION@\n" "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" @@ -234,34 +234,40 @@ static char const gnutls_cli_opt_strs[4929] = /* 3994 */ "Disable all the TLS extensions\0" /* 4025 */ "DISABLE_EXTENSIONS\0" /* 4044 */ "disable-extensions\0" -/* 4063 */ "Inline commands of the form ^<cmd>^\0" -/* 4099 */ "INLINE_COMMANDS\0" -/* 4115 */ "inline-commands\0" -/* 4131 */ "Change the default delimiter for inline commands.\0" -/* 4181 */ "INLINE_COMMANDS_PREFIX\0" -/* 4204 */ "inline-commands-prefix\0" -/* 4227 */ "Specify the PKCS #11 provider library\0" -/* 4265 */ "PROVIDER\0" -/* 4274 */ "provider\0" -/* 4283 */ "Reports the status of the FIPS140-2 mode in gnutls library\0" -/* 4342 */ "FIPS140_MODE\0" -/* 4355 */ "fips140-mode\0" -/* 4368 */ "display extended usage information and exit\0" -/* 4412 */ "help\0" -/* 4417 */ "extended usage information passed thru pager\0" -/* 4462 */ "more-help\0" -/* 4472 */ "output version information and exit\0" -/* 4508 */ "version\0" -/* 4516 */ "GNUTLS_CLI\0" -/* 4527 */ "gnutls-cli - GnuTLS client\n" +/* 4063 */ "Send a single key share under TLS1.3\0" +/* 4100 */ "SINGLE_KEY_SHARE\0" +/* 4117 */ "single-key-share\0" +/* 4134 */ "Enable post-handshake authentication under TLS1.3\0" +/* 4184 */ "POST_HANDSHAKE_AUTH\0" +/* 4204 */ "post-handshake-auth\0" +/* 4224 */ "Inline commands of the form ^<cmd>^\0" +/* 4260 */ "INLINE_COMMANDS\0" +/* 4276 */ "inline-commands\0" +/* 4292 */ "Change the default delimiter for inline commands.\0" +/* 4342 */ "INLINE_COMMANDS_PREFIX\0" +/* 4365 */ "inline-commands-prefix\0" +/* 4388 */ "Specify the PKCS #11 provider library\0" +/* 4426 */ "PROVIDER\0" +/* 4435 */ "provider\0" +/* 4444 */ "Reports the status of the FIPS140-2 mode in gnutls library\0" +/* 4503 */ "FIPS140_MODE\0" +/* 4516 */ "fips140-mode\0" +/* 4529 */ "display extended usage information and exit\0" +/* 4573 */ "help\0" +/* 4578 */ "extended usage information passed thru pager\0" +/* 4623 */ "more-help\0" +/* 4633 */ "output version information and exit\0" +/* 4669 */ "version\0" +/* 4677 */ "GNUTLS_CLI\0" +/* 4688 */ "gnutls-cli - GnuTLS client\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostname]\n\0" -/* 4623 */ "@PACKAGE_BUGREPORT@\0" -/* 4643 */ "\n\0" -/* 4645 */ "Simple client program to set up a TLS connection to some other computer. It\n" +/* 4784 */ "@PACKAGE_BUGREPORT@\0" +/* 4804 */ "\n\0" +/* 4806 */ "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" -/* 4828 */ "gnutls-cli @VERSION@\0" -/* 4849 */ "Usage: gnutls-cli [options] hostname\n" +/* 4989 */ "gnutls-cli @VERSION@\0" +/* 5010 */ "Usage: gnutls-cli [options] hostname\n" "gnutls-cli --help for usage instructions.\n"; /** @@ -935,14 +941,38 @@ static int const aListCantList[] = { #define DISABLE_EXTENSIONS_FLAGS (OPTST_DISABLED) /** + * single-key-share option description: + */ +/** Descriptive text for the single-key-share option */ +#define SINGLE_KEY_SHARE_DESC (gnutls_cli_opt_strs+4063) +/** Upper-cased name for the single-key-share option */ +#define SINGLE_KEY_SHARE_NAME (gnutls_cli_opt_strs+4100) +/** Name string for the single-key-share option */ +#define SINGLE_KEY_SHARE_name (gnutls_cli_opt_strs+4117) +/** Compiled in flag settings for the single-key-share option */ +#define SINGLE_KEY_SHARE_FLAGS (OPTST_DISABLED) + +/** + * post-handshake-auth option description: + */ +/** Descriptive text for the post-handshake-auth option */ +#define POST_HANDSHAKE_AUTH_DESC (gnutls_cli_opt_strs+4134) +/** Upper-cased name for the post-handshake-auth option */ +#define POST_HANDSHAKE_AUTH_NAME (gnutls_cli_opt_strs+4184) +/** Name string for the post-handshake-auth option */ +#define POST_HANDSHAKE_AUTH_name (gnutls_cli_opt_strs+4204) +/** Compiled in flag settings for the post-handshake-auth option */ +#define POST_HANDSHAKE_AUTH_FLAGS (OPTST_DISABLED) + +/** * inline-commands option description: */ /** Descriptive text for the inline-commands option */ -#define INLINE_COMMANDS_DESC (gnutls_cli_opt_strs+4063) +#define INLINE_COMMANDS_DESC (gnutls_cli_opt_strs+4224) /** Upper-cased name for the inline-commands option */ -#define INLINE_COMMANDS_NAME (gnutls_cli_opt_strs+4099) +#define INLINE_COMMANDS_NAME (gnutls_cli_opt_strs+4260) /** Name string for the inline-commands option */ -#define INLINE_COMMANDS_name (gnutls_cli_opt_strs+4115) +#define INLINE_COMMANDS_name (gnutls_cli_opt_strs+4276) /** Compiled in flag settings for the inline-commands option */ #define INLINE_COMMANDS_FLAGS (OPTST_DISABLED) @@ -950,11 +980,11 @@ static int const aListCantList[] = { * inline-commands-prefix option description: */ /** Descriptive text for the inline-commands-prefix option */ -#define INLINE_COMMANDS_PREFIX_DESC (gnutls_cli_opt_strs+4131) +#define INLINE_COMMANDS_PREFIX_DESC (gnutls_cli_opt_strs+4292) /** Upper-cased name for the inline-commands-prefix option */ -#define INLINE_COMMANDS_PREFIX_NAME (gnutls_cli_opt_strs+4181) +#define INLINE_COMMANDS_PREFIX_NAME (gnutls_cli_opt_strs+4342) /** Name string for the inline-commands-prefix option */ -#define INLINE_COMMANDS_PREFIX_name (gnutls_cli_opt_strs+4204) +#define INLINE_COMMANDS_PREFIX_name (gnutls_cli_opt_strs+4365) /** Compiled in flag settings for the inline-commands-prefix option */ #define INLINE_COMMANDS_PREFIX_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -963,11 +993,11 @@ static int const aListCantList[] = { * provider option description: */ /** Descriptive text for the provider option */ -#define PROVIDER_DESC (gnutls_cli_opt_strs+4227) +#define PROVIDER_DESC (gnutls_cli_opt_strs+4388) /** Upper-cased name for the provider option */ -#define PROVIDER_NAME (gnutls_cli_opt_strs+4265) +#define PROVIDER_NAME (gnutls_cli_opt_strs+4426) /** Name string for the provider option */ -#define PROVIDER_name (gnutls_cli_opt_strs+4274) +#define PROVIDER_name (gnutls_cli_opt_strs+4435) /** Compiled in flag settings for the provider option */ #define PROVIDER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -976,22 +1006,22 @@ static int const aListCantList[] = { * fips140-mode option description: */ /** Descriptive text for the fips140-mode option */ -#define FIPS140_MODE_DESC (gnutls_cli_opt_strs+4283) +#define FIPS140_MODE_DESC (gnutls_cli_opt_strs+4444) /** Upper-cased name for the fips140-mode option */ -#define FIPS140_MODE_NAME (gnutls_cli_opt_strs+4342) +#define FIPS140_MODE_NAME (gnutls_cli_opt_strs+4503) /** Name string for the fips140-mode option */ -#define FIPS140_MODE_name (gnutls_cli_opt_strs+4355) +#define FIPS140_MODE_name (gnutls_cli_opt_strs+4516) /** Compiled in flag settings for the fips140-mode option */ #define FIPS140_MODE_FLAGS (OPTST_DISABLED) /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (gnutls_cli_opt_strs+4368) -#define HELP_name (gnutls_cli_opt_strs+4412) +#define HELP_DESC (gnutls_cli_opt_strs+4529) +#define HELP_name (gnutls_cli_opt_strs+4573) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (gnutls_cli_opt_strs+4417) -#define MORE_HELP_name (gnutls_cli_opt_strs+4462) +#define MORE_HELP_DESC (gnutls_cli_opt_strs+4578) +#define MORE_HELP_name (gnutls_cli_opt_strs+4623) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -1004,8 +1034,8 @@ static int const aListCantList[] = { # 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+4472) -#define VER_name (gnutls_cli_opt_strs+4508) +#define VER_DESC (gnutls_cli_opt_strs+4633) +#define VER_name (gnutls_cli_opt_strs+4669) /** * Declare option callback procedures */ @@ -1638,8 +1668,32 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ DISABLE_EXTENSIONS_DESC, DISABLE_EXTENSIONS_NAME, DISABLE_EXTENSIONS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 51, VALUE_OPT_INLINE_COMMANDS, - /* equiv idx, value */ 51, VALUE_OPT_INLINE_COMMANDS, + { /* entry idx, value */ 51, VALUE_OPT_SINGLE_KEY_SHARE, + /* equiv idx, value */ 51, VALUE_OPT_SINGLE_KEY_SHARE, + /* equivalenced to */ NO_EQUIVALENT, + /* min, max, act ct */ 0, 1, 0, + /* opt state flags */ SINGLE_KEY_SHARE_FLAGS, 0, + /* last opt argumnt */ { NULL }, /* --single-key-share */ + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, NULL, + /* option proc */ NULL, + /* desc, NAME, name */ SINGLE_KEY_SHARE_DESC, SINGLE_KEY_SHARE_NAME, SINGLE_KEY_SHARE_name, + /* disablement strs */ NULL, NULL }, + + { /* entry idx, value */ 52, VALUE_OPT_POST_HANDSHAKE_AUTH, + /* equiv idx, value */ 52, VALUE_OPT_POST_HANDSHAKE_AUTH, + /* equivalenced to */ NO_EQUIVALENT, + /* min, max, act ct */ 0, 1, 0, + /* opt state flags */ POST_HANDSHAKE_AUTH_FLAGS, 0, + /* last opt argumnt */ { NULL }, /* --post-handshake-auth */ + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, NULL, + /* option proc */ NULL, + /* desc, NAME, name */ POST_HANDSHAKE_AUTH_DESC, POST_HANDSHAKE_AUTH_NAME, POST_HANDSHAKE_AUTH_name, + /* disablement strs */ NULL, NULL }, + + { /* entry idx, value */ 53, VALUE_OPT_INLINE_COMMANDS, + /* equiv idx, value */ 53, VALUE_OPT_INLINE_COMMANDS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ INLINE_COMMANDS_FLAGS, 0, @@ -1650,8 +1704,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ INLINE_COMMANDS_DESC, INLINE_COMMANDS_NAME, INLINE_COMMANDS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 52, VALUE_OPT_INLINE_COMMANDS_PREFIX, - /* equiv idx, value */ 52, VALUE_OPT_INLINE_COMMANDS_PREFIX, + { /* entry idx, value */ 54, VALUE_OPT_INLINE_COMMANDS_PREFIX, + /* equiv idx, value */ 54, VALUE_OPT_INLINE_COMMANDS_PREFIX, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ INLINE_COMMANDS_PREFIX_FLAGS, 0, @@ -1662,8 +1716,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ INLINE_COMMANDS_PREFIX_DESC, INLINE_COMMANDS_PREFIX_NAME, INLINE_COMMANDS_PREFIX_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 53, VALUE_OPT_PROVIDER, - /* equiv idx, value */ 53, VALUE_OPT_PROVIDER, + { /* entry idx, value */ 55, VALUE_OPT_PROVIDER, + /* equiv idx, value */ 55, VALUE_OPT_PROVIDER, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PROVIDER_FLAGS, 0, @@ -1674,8 +1728,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PROVIDER_DESC, PROVIDER_NAME, PROVIDER_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 54, VALUE_OPT_FIPS140_MODE, - /* equiv idx, value */ 54, VALUE_OPT_FIPS140_MODE, + { /* entry idx, value */ 56, VALUE_OPT_FIPS140_MODE, + /* equiv idx, value */ 56, VALUE_OPT_FIPS140_MODE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ FIPS140_MODE_FLAGS, 0, @@ -1728,21 +1782,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of gnutls-cli. */ -#define zPROGNAME (gnutls_cli_opt_strs+4516) +#define zPROGNAME (gnutls_cli_opt_strs+4677) /** Reference to the title line for gnutls-cli usage. */ -#define zUsageTitle (gnutls_cli_opt_strs+4527) +#define zUsageTitle (gnutls_cli_opt_strs+4688) /** There is no gnutls-cli configuration file. */ #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+4623) +#define zBugsAddr (gnutls_cli_opt_strs+4784) /** Clarification/explanation of what gnutls-cli does. */ -#define zExplain (gnutls_cli_opt_strs+4643) +#define zExplain (gnutls_cli_opt_strs+4804) /** Extra detail explaining what gnutls-cli does. */ -#define zDetail (gnutls_cli_opt_strs+4645) +#define zDetail (gnutls_cli_opt_strs+4806) /** The full version string for gnutls-cli. */ -#define zFullVersion (gnutls_cli_opt_strs+4828) +#define zFullVersion (gnutls_cli_opt_strs+4989) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -1754,7 +1808,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define gnutls_cli_full_usage (NULL) -#define gnutls_cli_short_usage (gnutls_cli_opt_strs+4849) +#define gnutls_cli_short_usage (gnutls_cli_opt_strs+5010) #endif /* not defined __doxygen__ */ @@ -2013,7 +2067,7 @@ tOptions gnutls_cliOptions = { NO_EQUIVALENT, /* '-#' option index */ NO_EQUIVALENT /* index of default opt */ }, - 58 /* full option count */, 55 /* user option count */, + 60 /* full option count */, 57 /* user option count */, gnutls_cli_full_usage, gnutls_cli_short_usage, NULL, NULL, PKGDATADIR, gnutls_cli_packager_info @@ -2322,6 +2376,12 @@ changed")); puts(_("Disable all the TLS extensions")); /* referenced via gnutls_cliOptions.pOptDesc->pzText */ + puts(_("Send a single key share under TLS1.3")); + + /* referenced via gnutls_cliOptions.pOptDesc->pzText */ + puts(_("Enable post-handshake authentication under TLS1.3")); + + /* referenced via gnutls_cliOptions.pOptDesc->pzText */ puts(_("Inline commands of the form ^<cmd>^")); /* referenced via gnutls_cliOptions.pOptDesc->pzText */ |