diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-06-16 10:21:52 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-06-16 15:31:51 +0200 |
| commit | 9aa8b4a37c49766b8299d52ab41ca823977f4367 (patch) | |
| tree | 2879a7cfa51d1687450bfe442220e159dc0a4282 | |
| parent | 2908e4651e91efdeead9e545fff842b84c687801 (diff) | |
| download | gnutls-9aa8b4a37c49766b8299d52ab41ca823977f4367.tar.gz | |
updated auto-generated files
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | src/certtool-args.c.bak | 802 | ||||
| -rw-r--r-- | src/certtool-args.h.bak | 172 | ||||
| -rw-r--r-- | src/cli-args.c.bak | 803 | ||||
| -rw-r--r-- | src/cli-args.h.bak | 126 | ||||
| -rw-r--r-- | src/serv-args.c.bak | 424 | ||||
| -rw-r--r-- | src/serv-args.h.bak | 66 |
6 files changed, 954 insertions, 1439 deletions
diff --git a/src/certtool-args.c.bak b/src/certtool-args.c.bak index b28c6aa803..49923a3428 100644 --- a/src/certtool-args.c.bak +++ b/src/certtool-args.c.bak @@ -63,7 +63,7 @@ extern FILE * option_usage_fp; /** * static const strings for certtool options */ -static char const certtool_opt_strs[7069] = +static char const certtool_opt_strs[6782] = /* 0 */ "certtool @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" @@ -202,155 +202,146 @@ static char const certtool_opt_strs[7069] = /* 3559 */ "Print certificate's public key\0" /* 3590 */ "CERTIFICATE_PUBKEY\0" /* 3609 */ "certificate-pubkey\0" -/* 3628 */ "Print information on the given OpenPGP certificate (deprecated)\0" -/* 3692 */ "PGP_CERTIFICATE_INFO\0" -/* 3713 */ "pgp-certificate-info\0" -/* 3734 */ "Print information on the given OpenPGP keyring structure (deprecated)\0" -/* 3804 */ "PGP_RING_INFO\0" -/* 3818 */ "pgp-ring-info\0" -/* 3832 */ "Print information on the given CRL structure\0" -/* 3877 */ "CRL_INFO\0" -/* 3886 */ "crl-info\0" -/* 3895 */ "Print information on the given certificate request\0" -/* 3946 */ "CRQ_INFO\0" -/* 3955 */ "crq-info\0" -/* 3964 */ "Do not use extensions in certificate requests\0" -/* 4010 */ "NO_CRQ_EXTENSIONS\0" -/* 4028 */ "no-crq-extensions\0" -/* 4046 */ "Print information on a PKCS #12 structure\0" -/* 4088 */ "P12_INFO\0" -/* 4097 */ "p12-info\0" -/* 4106 */ "The PKCS #12 friendly name to use\0" -/* 4140 */ "P12_NAME\0" -/* 4149 */ "p12-name\0" -/* 4158 */ "Generate a PKCS #7 structure\0" -/* 4187 */ "P7_GENERATE\0" -/* 4199 */ "p7-generate\0" -/* 4211 */ "Signs using a PKCS #7 structure\0" -/* 4243 */ "P7_SIGN\0" -/* 4251 */ "p7-sign\0" -/* 4259 */ "Signs using a detached PKCS #7 structure\0" -/* 4300 */ "P7_DETACHED_SIGN\0" -/* 4317 */ "p7-detached-sign\0" -/* 4334 */ "The signer's certificate will be included in the cert list.\0" -/* 4394 */ "P7_INCLUDE_CERT\0" -/* 4410 */ "no-p7-include-cert\0" -/* 4429 */ "no\0" -/* 4432 */ "Will include a timestamp in the PKCS #7 structure\0" -/* 4482 */ "P7_TIME\0" -/* 4490 */ "no-p7-time\0" -/* 4501 */ "Will show the embedded data in the PKCS #7 structure\0" -/* 4554 */ "P7_SHOW_DATA\0" -/* 4567 */ "no-p7-show-data\0" -/* 4583 */ "Print information on a PKCS #7 structure\0" -/* 4624 */ "P7_INFO\0" -/* 4632 */ "p7-info\0" -/* 4640 */ "Verify the provided PKCS #7 structure\0" -/* 4678 */ "P7_VERIFY\0" -/* 4688 */ "p7-verify\0" -/* 4698 */ "Print information on a PKCS #8 structure\0" -/* 4739 */ "P8_INFO\0" -/* 4747 */ "p8-info\0" -/* 4755 */ "Convert S/MIME to PKCS #7 structure\0" -/* 4791 */ "SMIME_TO_P7\0" -/* 4803 */ "smime-to-p7\0" -/* 4815 */ "Print information on a private key\0" -/* 4850 */ "KEY_INFO\0" -/* 4859 */ "key-info\0" -/* 4868 */ "Print information on an OpenPGP private key (deprecated)\0" -/* 4925 */ "PGP_KEY_INFO\0" -/* 4938 */ "pgp-key-info\0" -/* 4951 */ "Print information on a public key\0" -/* 4985 */ "PUBKEY_INFO\0" -/* 4997 */ "pubkey-info\0" -/* 5009 */ "Generate an X.509 version 1 certificate (with no extensions)\0" -/* 5070 */ "V1\0" -/* 5073 */ "v1\0" -/* 5076 */ "Generate a PKCS #12 structure\0" -/* 5106 */ "TO_P12\0" -/* 5113 */ "to-p12\0" -/* 5120 */ "Generate a PKCS #8 structure\0" -/* 5149 */ "TO_P8\0" -/* 5155 */ "to-p8\0" -/* 5161 */ "Use PKCS #8 format for private keys\0" -/* 5197 */ "PKCS8\0" -/* 5203 */ "pkcs8\0" -/* 5209 */ "Generate RSA key\0" -/* 5226 */ "RSA\0" -/* 5230 */ "rsa\0" -/* 5234 */ "Generate DSA key\0" -/* 5251 */ "DSA\0" -/* 5255 */ "dsa\0" -/* 5259 */ "Generate ECC (ECDSA) key\0" -/* 5284 */ "ECC\0" -/* 5288 */ "ecc\0" -/* 5292 */ "an alias for the 'ecc' option\0" -/* 5322 */ "ecdsa\0" -/* 5328 */ "Generate RSA-PSS key or certificate\0" -/* 5364 */ "RSA_PSS\0" -/* 5372 */ "rsa-pss\0" -/* 5380 */ "Sign a certificate with a specific signature algorithm\0" -/* 5435 */ "SIGN_PARAMS\0" -/* 5447 */ "sign-params\0" -/* 5459 */ "Hash algorithm to use for signing\0" -/* 5493 */ "HASH\0" -/* 5498 */ "hash\0" -/* 5503 */ "Use DER format for input certificates, private keys, and DH parameters\0" -/* 5574 */ "INDER\0" -/* 5580 */ "no-inder\0" -/* 5589 */ "an alias for the 'inder' option\0" -/* 5621 */ "inraw\0" -/* 5627 */ "Use DER format for output certificates, private keys, and DH parameters\0" -/* 5699 */ "OUTDER\0" -/* 5706 */ "no-outder\0" -/* 5716 */ "an alias for the 'outder' option\0" -/* 5749 */ "outraw\0" -/* 5756 */ "Specify the number of bits for key generate\0" -/* 5800 */ "BITS\0" -/* 5805 */ "bits\0" -/* 5810 */ "Specify the curve used for EC key generation\0" -/* 5855 */ "CURVE\0" -/* 5861 */ "curve\0" -/* 5867 */ "Specify the security level [low, legacy, medium, high, ultra]\0" -/* 5929 */ "SEC_PARAM\0" -/* 5939 */ "sec-param\0" -/* 5949 */ "No effect (deprecated)\0" -/* 5972 */ "DISABLE_QUICK_RANDOM\0" -/* 5993 */ "disable-quick-random\0" -/* 6014 */ "Template file to use for non-interactive operation\0" -/* 6065 */ "TEMPLATE\0" -/* 6074 */ "template\0" -/* 6083 */ "Print information to stdout instead of stderr\0" -/* 6129 */ "STDOUT_INFO\0" -/* 6141 */ "stdout-info\0" -/* 6153 */ "Enable interaction for entering password when in batch mode.\0" -/* 6214 */ "ASK_PASS\0" -/* 6223 */ "ask-pass\0" -/* 6232 */ "Cipher to use for PKCS #8 and #12 operations\0" -/* 6277 */ "PKCS_CIPHER\0" -/* 6289 */ "pkcs-cipher\0" -/* 6301 */ "Specify the PKCS #11 provider library\0" -/* 6339 */ "PROVIDER\0" -/* 6348 */ "provider\0" -/* 6357 */ "display extended usage information and exit\0" -/* 6401 */ "help\0" -/* 6406 */ "extended usage information passed thru pager\0" -/* 6451 */ "more-help\0" -/* 6461 */ "output version information and exit\0" -/* 6497 */ "version\0" -/* 6505 */ "CERTTOOL\0" -/* 6514 */ "certtool - GnuTLS certificate tool\n" +/* 3628 */ "Print information on the given CRL structure\0" +/* 3673 */ "CRL_INFO\0" +/* 3682 */ "crl-info\0" +/* 3691 */ "Print information on the given certificate request\0" +/* 3742 */ "CRQ_INFO\0" +/* 3751 */ "crq-info\0" +/* 3760 */ "Do not use extensions in certificate requests\0" +/* 3806 */ "NO_CRQ_EXTENSIONS\0" +/* 3824 */ "no-crq-extensions\0" +/* 3842 */ "Print information on a PKCS #12 structure\0" +/* 3884 */ "P12_INFO\0" +/* 3893 */ "p12-info\0" +/* 3902 */ "The PKCS #12 friendly name to use\0" +/* 3936 */ "P12_NAME\0" +/* 3945 */ "p12-name\0" +/* 3954 */ "Generate a PKCS #7 structure\0" +/* 3983 */ "P7_GENERATE\0" +/* 3995 */ "p7-generate\0" +/* 4007 */ "Signs using a PKCS #7 structure\0" +/* 4039 */ "P7_SIGN\0" +/* 4047 */ "p7-sign\0" +/* 4055 */ "Signs using a detached PKCS #7 structure\0" +/* 4096 */ "P7_DETACHED_SIGN\0" +/* 4113 */ "p7-detached-sign\0" +/* 4130 */ "The signer's certificate will be included in the cert list.\0" +/* 4190 */ "P7_INCLUDE_CERT\0" +/* 4206 */ "no-p7-include-cert\0" +/* 4225 */ "no\0" +/* 4228 */ "Will include a timestamp in the PKCS #7 structure\0" +/* 4278 */ "P7_TIME\0" +/* 4286 */ "no-p7-time\0" +/* 4297 */ "Will show the embedded data in the PKCS #7 structure\0" +/* 4350 */ "P7_SHOW_DATA\0" +/* 4363 */ "no-p7-show-data\0" +/* 4379 */ "Print information on a PKCS #7 structure\0" +/* 4420 */ "P7_INFO\0" +/* 4428 */ "p7-info\0" +/* 4436 */ "Verify the provided PKCS #7 structure\0" +/* 4474 */ "P7_VERIFY\0" +/* 4484 */ "p7-verify\0" +/* 4494 */ "Print information on a PKCS #8 structure\0" +/* 4535 */ "P8_INFO\0" +/* 4543 */ "p8-info\0" +/* 4551 */ "Convert S/MIME to PKCS #7 structure\0" +/* 4587 */ "SMIME_TO_P7\0" +/* 4599 */ "smime-to-p7\0" +/* 4611 */ "Print information on a private key\0" +/* 4646 */ "KEY_INFO\0" +/* 4655 */ "key-info\0" +/* 4664 */ "Print information on a public key\0" +/* 4698 */ "PUBKEY_INFO\0" +/* 4710 */ "pubkey-info\0" +/* 4722 */ "Generate an X.509 version 1 certificate (with no extensions)\0" +/* 4783 */ "V1\0" +/* 4786 */ "v1\0" +/* 4789 */ "Generate a PKCS #12 structure\0" +/* 4819 */ "TO_P12\0" +/* 4826 */ "to-p12\0" +/* 4833 */ "Generate a PKCS #8 structure\0" +/* 4862 */ "TO_P8\0" +/* 4868 */ "to-p8\0" +/* 4874 */ "Use PKCS #8 format for private keys\0" +/* 4910 */ "PKCS8\0" +/* 4916 */ "pkcs8\0" +/* 4922 */ "Generate RSA key\0" +/* 4939 */ "RSA\0" +/* 4943 */ "rsa\0" +/* 4947 */ "Generate DSA key\0" +/* 4964 */ "DSA\0" +/* 4968 */ "dsa\0" +/* 4972 */ "Generate ECC (ECDSA) key\0" +/* 4997 */ "ECC\0" +/* 5001 */ "ecc\0" +/* 5005 */ "an alias for the 'ecc' option\0" +/* 5035 */ "ecdsa\0" +/* 5041 */ "Generate RSA-PSS key or certificate\0" +/* 5077 */ "RSA_PSS\0" +/* 5085 */ "rsa-pss\0" +/* 5093 */ "Sign a certificate with a specific signature algorithm\0" +/* 5148 */ "SIGN_PARAMS\0" +/* 5160 */ "sign-params\0" +/* 5172 */ "Hash algorithm to use for signing\0" +/* 5206 */ "HASH\0" +/* 5211 */ "hash\0" +/* 5216 */ "Use DER format for input certificates, private keys, and DH parameters\0" +/* 5287 */ "INDER\0" +/* 5293 */ "no-inder\0" +/* 5302 */ "an alias for the 'inder' option\0" +/* 5334 */ "inraw\0" +/* 5340 */ "Use DER format for output certificates, private keys, and DH parameters\0" +/* 5412 */ "OUTDER\0" +/* 5419 */ "no-outder\0" +/* 5429 */ "an alias for the 'outder' option\0" +/* 5462 */ "outraw\0" +/* 5469 */ "Specify the number of bits for key generate\0" +/* 5513 */ "BITS\0" +/* 5518 */ "bits\0" +/* 5523 */ "Specify the curve used for EC key generation\0" +/* 5568 */ "CURVE\0" +/* 5574 */ "curve\0" +/* 5580 */ "Specify the security level [low, legacy, medium, high, ultra]\0" +/* 5642 */ "SEC_PARAM\0" +/* 5652 */ "sec-param\0" +/* 5662 */ "No effect (deprecated)\0" +/* 5685 */ "DISABLE_QUICK_RANDOM\0" +/* 5706 */ "disable-quick-random\0" +/* 5727 */ "Template file to use for non-interactive operation\0" +/* 5778 */ "TEMPLATE\0" +/* 5787 */ "template\0" +/* 5796 */ "Print information to stdout instead of stderr\0" +/* 5842 */ "STDOUT_INFO\0" +/* 5854 */ "stdout-info\0" +/* 5866 */ "Enable interaction for entering password when in batch mode.\0" +/* 5927 */ "ASK_PASS\0" +/* 5936 */ "ask-pass\0" +/* 5945 */ "Cipher to use for PKCS #8 and #12 operations\0" +/* 5990 */ "PKCS_CIPHER\0" +/* 6002 */ "pkcs-cipher\0" +/* 6014 */ "Specify the PKCS #11 provider library\0" +/* 6052 */ "PROVIDER\0" +/* 6061 */ "provider\0" +/* 6070 */ "display extended usage information and exit\0" +/* 6114 */ "help\0" +/* 6119 */ "extended usage information passed thru pager\0" +/* 6164 */ "more-help\0" +/* 6174 */ "output version information and exit\0" +/* 6210 */ "version\0" +/* 6218 */ "CERTTOOL\0" +/* 6227 */ "certtool - GnuTLS certificate tool\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" -/* 6607 */ "@PACKAGE_BUGREPORT@\0" -/* 6627 */ "\n\0" -/* 6629 */ "Tool to parse and generate X.509 certificates, requests and private keys.\n" +/* 6320 */ "@PACKAGE_BUGREPORT@\0" +/* 6340 */ "\n\0" +/* 6342 */ "Tool to parse and generate X.509 certificates, requests and private keys.\n" "It can be used interactively or non interactively by specifying the\n" "template command line option.\n\n" "The tool accepts files or supported URIs via the --infile option. In case\n" "PIN is required for URI access you can provide it using the environment\n" "variables GNUTLS_PIN and GNUTLS_SO_PIN.\n\0" -/* 6990 */ "certtool @VERSION@\0" -/* 7009 */ "certtool [options]\n" +/* 6703 */ "certtool @VERSION@\0" +/* 6722 */ "certtool [options]\n" "certtool --help for usage instructions.\n"; /** @@ -874,38 +865,14 @@ static int const aVerify_EmailCantList[] = { #define CERTIFICATE_PUBKEY_FLAGS (OPTST_DISABLED) /** - * pgp-certificate-info option description: - */ -/** Descriptive text for the pgp-certificate-info option */ -#define PGP_CERTIFICATE_INFO_DESC (certtool_opt_strs+3628) -/** Upper-cased name for the pgp-certificate-info option */ -#define PGP_CERTIFICATE_INFO_NAME (certtool_opt_strs+3692) -/** Name string for the pgp-certificate-info option */ -#define PGP_CERTIFICATE_INFO_name (certtool_opt_strs+3713) -/** Compiled in flag settings for the pgp-certificate-info option */ -#define PGP_CERTIFICATE_INFO_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) - -/** - * pgp-ring-info option description: - */ -/** Descriptive text for the pgp-ring-info option */ -#define PGP_RING_INFO_DESC (certtool_opt_strs+3734) -/** Upper-cased name for the pgp-ring-info option */ -#define PGP_RING_INFO_NAME (certtool_opt_strs+3804) -/** Name string for the pgp-ring-info option */ -#define PGP_RING_INFO_name (certtool_opt_strs+3818) -/** Compiled in flag settings for the pgp-ring-info option */ -#define PGP_RING_INFO_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) - -/** * crl-info option description: */ /** Descriptive text for the crl-info option */ -#define CRL_INFO_DESC (certtool_opt_strs+3832) +#define CRL_INFO_DESC (certtool_opt_strs+3628) /** Upper-cased name for the crl-info option */ -#define CRL_INFO_NAME (certtool_opt_strs+3877) +#define CRL_INFO_NAME (certtool_opt_strs+3673) /** Name string for the crl-info option */ -#define CRL_INFO_name (certtool_opt_strs+3886) +#define CRL_INFO_name (certtool_opt_strs+3682) /** Compiled in flag settings for the crl-info option */ #define CRL_INFO_FLAGS (OPTST_DISABLED) @@ -913,11 +880,11 @@ static int const aVerify_EmailCantList[] = { * crq-info option description: */ /** Descriptive text for the crq-info option */ -#define CRQ_INFO_DESC (certtool_opt_strs+3895) +#define CRQ_INFO_DESC (certtool_opt_strs+3691) /** Upper-cased name for the crq-info option */ -#define CRQ_INFO_NAME (certtool_opt_strs+3946) +#define CRQ_INFO_NAME (certtool_opt_strs+3742) /** Name string for the crq-info option */ -#define CRQ_INFO_name (certtool_opt_strs+3955) +#define CRQ_INFO_name (certtool_opt_strs+3751) /** Compiled in flag settings for the crq-info option */ #define CRQ_INFO_FLAGS (OPTST_DISABLED) @@ -925,11 +892,11 @@ static int const aVerify_EmailCantList[] = { * no-crq-extensions option description: */ /** Descriptive text for the no-crq-extensions option */ -#define NO_CRQ_EXTENSIONS_DESC (certtool_opt_strs+3964) +#define NO_CRQ_EXTENSIONS_DESC (certtool_opt_strs+3760) /** Upper-cased name for the no-crq-extensions option */ -#define NO_CRQ_EXTENSIONS_NAME (certtool_opt_strs+4010) +#define NO_CRQ_EXTENSIONS_NAME (certtool_opt_strs+3806) /** Name string for the no-crq-extensions option */ -#define NO_CRQ_EXTENSIONS_name (certtool_opt_strs+4028) +#define NO_CRQ_EXTENSIONS_name (certtool_opt_strs+3824) /** Compiled in flag settings for the no-crq-extensions option */ #define NO_CRQ_EXTENSIONS_FLAGS (OPTST_DISABLED) @@ -937,11 +904,11 @@ static int const aVerify_EmailCantList[] = { * p12-info option description: */ /** Descriptive text for the p12-info option */ -#define P12_INFO_DESC (certtool_opt_strs+4046) +#define P12_INFO_DESC (certtool_opt_strs+3842) /** Upper-cased name for the p12-info option */ -#define P12_INFO_NAME (certtool_opt_strs+4088) +#define P12_INFO_NAME (certtool_opt_strs+3884) /** Name string for the p12-info option */ -#define P12_INFO_name (certtool_opt_strs+4097) +#define P12_INFO_name (certtool_opt_strs+3893) /** Compiled in flag settings for the p12-info option */ #define P12_INFO_FLAGS (OPTST_DISABLED) @@ -949,11 +916,11 @@ static int const aVerify_EmailCantList[] = { * p12-name option description: */ /** Descriptive text for the p12-name option */ -#define P12_NAME_DESC (certtool_opt_strs+4106) +#define P12_NAME_DESC (certtool_opt_strs+3902) /** Upper-cased name for the p12-name option */ -#define P12_NAME_NAME (certtool_opt_strs+4140) +#define P12_NAME_NAME (certtool_opt_strs+3936) /** Name string for the p12-name option */ -#define P12_NAME_name (certtool_opt_strs+4149) +#define P12_NAME_name (certtool_opt_strs+3945) /** Compiled in flag settings for the p12-name option */ #define P12_NAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -962,11 +929,11 @@ static int const aVerify_EmailCantList[] = { * p7-generate option description: */ /** Descriptive text for the p7-generate option */ -#define P7_GENERATE_DESC (certtool_opt_strs+4158) +#define P7_GENERATE_DESC (certtool_opt_strs+3954) /** Upper-cased name for the p7-generate option */ -#define P7_GENERATE_NAME (certtool_opt_strs+4187) +#define P7_GENERATE_NAME (certtool_opt_strs+3983) /** Name string for the p7-generate option */ -#define P7_GENERATE_name (certtool_opt_strs+4199) +#define P7_GENERATE_name (certtool_opt_strs+3995) /** Compiled in flag settings for the p7-generate option */ #define P7_GENERATE_FLAGS (OPTST_DISABLED) @@ -974,11 +941,11 @@ static int const aVerify_EmailCantList[] = { * p7-sign option description: */ /** Descriptive text for the p7-sign option */ -#define P7_SIGN_DESC (certtool_opt_strs+4211) +#define P7_SIGN_DESC (certtool_opt_strs+4007) /** Upper-cased name for the p7-sign option */ -#define P7_SIGN_NAME (certtool_opt_strs+4243) +#define P7_SIGN_NAME (certtool_opt_strs+4039) /** Name string for the p7-sign option */ -#define P7_SIGN_name (certtool_opt_strs+4251) +#define P7_SIGN_name (certtool_opt_strs+4047) /** Compiled in flag settings for the p7-sign option */ #define P7_SIGN_FLAGS (OPTST_DISABLED) @@ -986,11 +953,11 @@ static int const aVerify_EmailCantList[] = { * p7-detached-sign option description: */ /** Descriptive text for the p7-detached-sign option */ -#define P7_DETACHED_SIGN_DESC (certtool_opt_strs+4259) +#define P7_DETACHED_SIGN_DESC (certtool_opt_strs+4055) /** Upper-cased name for the p7-detached-sign option */ -#define P7_DETACHED_SIGN_NAME (certtool_opt_strs+4300) +#define P7_DETACHED_SIGN_NAME (certtool_opt_strs+4096) /** Name string for the p7-detached-sign option */ -#define P7_DETACHED_SIGN_name (certtool_opt_strs+4317) +#define P7_DETACHED_SIGN_name (certtool_opt_strs+4113) /** Compiled in flag settings for the p7-detached-sign option */ #define P7_DETACHED_SIGN_FLAGS (OPTST_DISABLED) @@ -998,13 +965,13 @@ static int const aVerify_EmailCantList[] = { * p7-include-cert option description: */ /** Descriptive text for the p7-include-cert option */ -#define P7_INCLUDE_CERT_DESC (certtool_opt_strs+4334) +#define P7_INCLUDE_CERT_DESC (certtool_opt_strs+4130) /** Upper-cased name for the p7-include-cert option */ -#define P7_INCLUDE_CERT_NAME (certtool_opt_strs+4394) +#define P7_INCLUDE_CERT_NAME (certtool_opt_strs+4190) /** disablement name for the p7-include-cert option */ -#define NOT_P7_INCLUDE_CERT_name (certtool_opt_strs+4410) +#define NOT_P7_INCLUDE_CERT_name (certtool_opt_strs+4206) /** disablement prefix for the p7-include-cert option */ -#define NOT_P7_INCLUDE_CERT_PFX (certtool_opt_strs+4429) +#define NOT_P7_INCLUDE_CERT_PFX (certtool_opt_strs+4225) /** Name string for the p7-include-cert option */ #define P7_INCLUDE_CERT_name (NOT_P7_INCLUDE_CERT_name + 3) /** Compiled in flag settings for the p7-include-cert option */ @@ -1014,13 +981,13 @@ static int const aVerify_EmailCantList[] = { * p7-time option description: */ /** Descriptive text for the p7-time option */ -#define P7_TIME_DESC (certtool_opt_strs+4432) +#define P7_TIME_DESC (certtool_opt_strs+4228) /** Upper-cased name for the p7-time option */ -#define P7_TIME_NAME (certtool_opt_strs+4482) +#define P7_TIME_NAME (certtool_opt_strs+4278) /** disablement name for the p7-time option */ -#define NOT_P7_TIME_name (certtool_opt_strs+4490) +#define NOT_P7_TIME_name (certtool_opt_strs+4286) /** disablement prefix for the p7-time option */ -#define NOT_P7_TIME_PFX (certtool_opt_strs+4429) +#define NOT_P7_TIME_PFX (certtool_opt_strs+4225) /** Name string for the p7-time option */ #define P7_TIME_name (NOT_P7_TIME_name + 3) /** Compiled in flag settings for the p7-time option */ @@ -1030,13 +997,13 @@ static int const aVerify_EmailCantList[] = { * p7-show-data option description: */ /** Descriptive text for the p7-show-data option */ -#define P7_SHOW_DATA_DESC (certtool_opt_strs+4501) +#define P7_SHOW_DATA_DESC (certtool_opt_strs+4297) /** Upper-cased name for the p7-show-data option */ -#define P7_SHOW_DATA_NAME (certtool_opt_strs+4554) +#define P7_SHOW_DATA_NAME (certtool_opt_strs+4350) /** disablement name for the p7-show-data option */ -#define NOT_P7_SHOW_DATA_name (certtool_opt_strs+4567) +#define NOT_P7_SHOW_DATA_name (certtool_opt_strs+4363) /** disablement prefix for the p7-show-data option */ -#define NOT_P7_SHOW_DATA_PFX (certtool_opt_strs+4429) +#define NOT_P7_SHOW_DATA_PFX (certtool_opt_strs+4225) /** Name string for the p7-show-data option */ #define P7_SHOW_DATA_name (NOT_P7_SHOW_DATA_name + 3) /** Compiled in flag settings for the p7-show-data option */ @@ -1046,11 +1013,11 @@ static int const aVerify_EmailCantList[] = { * p7-info option description: */ /** Descriptive text for the p7-info option */ -#define P7_INFO_DESC (certtool_opt_strs+4583) +#define P7_INFO_DESC (certtool_opt_strs+4379) /** Upper-cased name for the p7-info option */ -#define P7_INFO_NAME (certtool_opt_strs+4624) +#define P7_INFO_NAME (certtool_opt_strs+4420) /** Name string for the p7-info option */ -#define P7_INFO_name (certtool_opt_strs+4632) +#define P7_INFO_name (certtool_opt_strs+4428) /** Compiled in flag settings for the p7-info option */ #define P7_INFO_FLAGS (OPTST_DISABLED) @@ -1058,11 +1025,11 @@ static int const aVerify_EmailCantList[] = { * p7-verify option description: */ /** Descriptive text for the p7-verify option */ -#define P7_VERIFY_DESC (certtool_opt_strs+4640) +#define P7_VERIFY_DESC (certtool_opt_strs+4436) /** Upper-cased name for the p7-verify option */ -#define P7_VERIFY_NAME (certtool_opt_strs+4678) +#define P7_VERIFY_NAME (certtool_opt_strs+4474) /** Name string for the p7-verify option */ -#define P7_VERIFY_name (certtool_opt_strs+4688) +#define P7_VERIFY_name (certtool_opt_strs+4484) /** Compiled in flag settings for the p7-verify option */ #define P7_VERIFY_FLAGS (OPTST_DISABLED) @@ -1070,11 +1037,11 @@ static int const aVerify_EmailCantList[] = { * p8-info option description: */ /** Descriptive text for the p8-info option */ -#define P8_INFO_DESC (certtool_opt_strs+4698) +#define P8_INFO_DESC (certtool_opt_strs+4494) /** Upper-cased name for the p8-info option */ -#define P8_INFO_NAME (certtool_opt_strs+4739) +#define P8_INFO_NAME (certtool_opt_strs+4535) /** Name string for the p8-info option */ -#define P8_INFO_name (certtool_opt_strs+4747) +#define P8_INFO_name (certtool_opt_strs+4543) /** Compiled in flag settings for the p8-info option */ #define P8_INFO_FLAGS (OPTST_DISABLED) @@ -1082,11 +1049,11 @@ static int const aVerify_EmailCantList[] = { * smime-to-p7 option description: */ /** Descriptive text for the smime-to-p7 option */ -#define SMIME_TO_P7_DESC (certtool_opt_strs+4755) +#define SMIME_TO_P7_DESC (certtool_opt_strs+4551) /** Upper-cased name for the smime-to-p7 option */ -#define SMIME_TO_P7_NAME (certtool_opt_strs+4791) +#define SMIME_TO_P7_NAME (certtool_opt_strs+4587) /** Name string for the smime-to-p7 option */ -#define SMIME_TO_P7_name (certtool_opt_strs+4803) +#define SMIME_TO_P7_name (certtool_opt_strs+4599) /** Compiled in flag settings for the smime-to-p7 option */ #define SMIME_TO_P7_FLAGS (OPTST_DISABLED) @@ -1094,35 +1061,23 @@ static int const aVerify_EmailCantList[] = { * key-info option description: */ /** Descriptive text for the key-info option */ -#define KEY_INFO_DESC (certtool_opt_strs+4815) +#define KEY_INFO_DESC (certtool_opt_strs+4611) /** Upper-cased name for the key-info option */ -#define KEY_INFO_NAME (certtool_opt_strs+4850) +#define KEY_INFO_NAME (certtool_opt_strs+4646) /** Name string for the key-info option */ -#define KEY_INFO_name (certtool_opt_strs+4859) +#define KEY_INFO_name (certtool_opt_strs+4655) /** Compiled in flag settings for the key-info option */ #define KEY_INFO_FLAGS (OPTST_DISABLED) /** - * pgp-key-info option description: - */ -/** Descriptive text for the pgp-key-info option */ -#define PGP_KEY_INFO_DESC (certtool_opt_strs+4868) -/** Upper-cased name for the pgp-key-info option */ -#define PGP_KEY_INFO_NAME (certtool_opt_strs+4925) -/** Name string for the pgp-key-info option */ -#define PGP_KEY_INFO_name (certtool_opt_strs+4938) -/** Compiled in flag settings for the pgp-key-info option */ -#define PGP_KEY_INFO_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) - -/** * pubkey-info option description: */ /** Descriptive text for the pubkey-info option */ -#define PUBKEY_INFO_DESC (certtool_opt_strs+4951) +#define PUBKEY_INFO_DESC (certtool_opt_strs+4664) /** Upper-cased name for the pubkey-info option */ -#define PUBKEY_INFO_NAME (certtool_opt_strs+4985) +#define PUBKEY_INFO_NAME (certtool_opt_strs+4698) /** Name string for the pubkey-info option */ -#define PUBKEY_INFO_name (certtool_opt_strs+4997) +#define PUBKEY_INFO_name (certtool_opt_strs+4710) /** Compiled in flag settings for the pubkey-info option */ #define PUBKEY_INFO_FLAGS (OPTST_DISABLED) @@ -1130,11 +1085,11 @@ static int const aVerify_EmailCantList[] = { * v1 option description: */ /** Descriptive text for the v1 option */ -#define V1_DESC (certtool_opt_strs+5009) +#define V1_DESC (certtool_opt_strs+4722) /** Upper-cased name for the v1 option */ -#define V1_NAME (certtool_opt_strs+5070) +#define V1_NAME (certtool_opt_strs+4783) /** Name string for the v1 option */ -#define V1_name (certtool_opt_strs+5073) +#define V1_name (certtool_opt_strs+4786) /** Compiled in flag settings for the v1 option */ #define V1_FLAGS (OPTST_DISABLED) @@ -1142,11 +1097,11 @@ static int const aVerify_EmailCantList[] = { * to-p12 option description: */ /** Descriptive text for the to-p12 option */ -#define TO_P12_DESC (certtool_opt_strs+5076) +#define TO_P12_DESC (certtool_opt_strs+4789) /** Upper-cased name for the to-p12 option */ -#define TO_P12_NAME (certtool_opt_strs+5106) +#define TO_P12_NAME (certtool_opt_strs+4819) /** Name string for the to-p12 option */ -#define TO_P12_name (certtool_opt_strs+5113) +#define TO_P12_name (certtool_opt_strs+4826) /** Compiled in flag settings for the to-p12 option */ #define TO_P12_FLAGS (OPTST_DISABLED) @@ -1154,11 +1109,11 @@ static int const aVerify_EmailCantList[] = { * to-p8 option description: */ /** Descriptive text for the to-p8 option */ -#define TO_P8_DESC (certtool_opt_strs+5120) +#define TO_P8_DESC (certtool_opt_strs+4833) /** Upper-cased name for the to-p8 option */ -#define TO_P8_NAME (certtool_opt_strs+5149) +#define TO_P8_NAME (certtool_opt_strs+4862) /** Name string for the to-p8 option */ -#define TO_P8_name (certtool_opt_strs+5155) +#define TO_P8_name (certtool_opt_strs+4868) /** Compiled in flag settings for the to-p8 option */ #define TO_P8_FLAGS (OPTST_DISABLED) @@ -1166,11 +1121,11 @@ static int const aVerify_EmailCantList[] = { * pkcs8 option description: */ /** Descriptive text for the pkcs8 option */ -#define PKCS8_DESC (certtool_opt_strs+5161) +#define PKCS8_DESC (certtool_opt_strs+4874) /** Upper-cased name for the pkcs8 option */ -#define PKCS8_NAME (certtool_opt_strs+5197) +#define PKCS8_NAME (certtool_opt_strs+4910) /** Name string for the pkcs8 option */ -#define PKCS8_name (certtool_opt_strs+5203) +#define PKCS8_name (certtool_opt_strs+4916) /** Compiled in flag settings for the pkcs8 option */ #define PKCS8_FLAGS (OPTST_DISABLED) @@ -1178,11 +1133,11 @@ static int const aVerify_EmailCantList[] = { * rsa option description: */ /** Descriptive text for the rsa option */ -#define RSA_DESC (certtool_opt_strs+5209) +#define RSA_DESC (certtool_opt_strs+4922) /** Upper-cased name for the rsa option */ -#define RSA_NAME (certtool_opt_strs+5226) +#define RSA_NAME (certtool_opt_strs+4939) /** Name string for the rsa option */ -#define RSA_name (certtool_opt_strs+5230) +#define RSA_name (certtool_opt_strs+4943) /** Compiled in flag settings for the rsa option */ #define RSA_FLAGS (OPTST_DISABLED) @@ -1190,11 +1145,11 @@ static int const aVerify_EmailCantList[] = { * dsa option description: */ /** Descriptive text for the dsa option */ -#define DSA_DESC (certtool_opt_strs+5234) +#define DSA_DESC (certtool_opt_strs+4947) /** Upper-cased name for the dsa option */ -#define DSA_NAME (certtool_opt_strs+5251) +#define DSA_NAME (certtool_opt_strs+4964) /** Name string for the dsa option */ -#define DSA_name (certtool_opt_strs+5255) +#define DSA_name (certtool_opt_strs+4968) /** Compiled in flag settings for the dsa option */ #define DSA_FLAGS (OPTST_DISABLED) @@ -1202,11 +1157,11 @@ static int const aVerify_EmailCantList[] = { * ecc option description: */ /** Descriptive text for the ecc option */ -#define ECC_DESC (certtool_opt_strs+5259) +#define ECC_DESC (certtool_opt_strs+4972) /** Upper-cased name for the ecc option */ -#define ECC_NAME (certtool_opt_strs+5284) +#define ECC_NAME (certtool_opt_strs+4997) /** Name string for the ecc option */ -#define ECC_name (certtool_opt_strs+5288) +#define ECC_name (certtool_opt_strs+5001) /** Compiled in flag settings for the ecc option */ #define ECC_FLAGS (OPTST_DISABLED) @@ -1214,10 +1169,10 @@ static int const aVerify_EmailCantList[] = { * ecdsa option description: */ /** Descriptive text for the ecdsa option */ -#define ECDSA_DESC (certtool_opt_strs+5292) +#define ECDSA_DESC (certtool_opt_strs+5005) #define ECDSA_NAME NULL /** Unmodified name string for the ecdsa option */ -#define ECDSA_name (certtool_opt_strs+5322) +#define ECDSA_name (certtool_opt_strs+5035) /** Compiled in flag settings for the ecdsa option */ #define ECDSA_FLAGS (ECC_FLAGS | OPTST_ALIAS) @@ -1225,11 +1180,11 @@ static int const aVerify_EmailCantList[] = { * rsa-pss option description: */ /** Descriptive text for the rsa-pss option */ -#define RSA_PSS_DESC (certtool_opt_strs+5328) +#define RSA_PSS_DESC (certtool_opt_strs+5041) /** Upper-cased name for the rsa-pss option */ -#define RSA_PSS_NAME (certtool_opt_strs+5364) +#define RSA_PSS_NAME (certtool_opt_strs+5077) /** Name string for the rsa-pss option */ -#define RSA_PSS_name (certtool_opt_strs+5372) +#define RSA_PSS_name (certtool_opt_strs+5085) /** Compiled in flag settings for the rsa-pss option */ #define RSA_PSS_FLAGS (OPTST_DISABLED) @@ -1237,11 +1192,11 @@ static int const aVerify_EmailCantList[] = { * sign-params option description: */ /** Descriptive text for the sign-params option */ -#define SIGN_PARAMS_DESC (certtool_opt_strs+5380) +#define SIGN_PARAMS_DESC (certtool_opt_strs+5093) /** Upper-cased name for the sign-params option */ -#define SIGN_PARAMS_NAME (certtool_opt_strs+5435) +#define SIGN_PARAMS_NAME (certtool_opt_strs+5148) /** Name string for the sign-params option */ -#define SIGN_PARAMS_name (certtool_opt_strs+5447) +#define SIGN_PARAMS_name (certtool_opt_strs+5160) /** Compiled in flag settings for the sign-params option */ #define SIGN_PARAMS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1250,11 +1205,11 @@ static int const aVerify_EmailCantList[] = { * hash option description: */ /** Descriptive text for the hash option */ -#define HASH_DESC (certtool_opt_strs+5459) +#define HASH_DESC (certtool_opt_strs+5172) /** Upper-cased name for the hash option */ -#define HASH_NAME (certtool_opt_strs+5493) +#define HASH_NAME (certtool_opt_strs+5206) /** Name string for the hash option */ -#define HASH_name (certtool_opt_strs+5498) +#define HASH_name (certtool_opt_strs+5211) /** Compiled in flag settings for the hash option */ #define HASH_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1263,13 +1218,13 @@ static int const aVerify_EmailCantList[] = { * inder option description: */ /** Descriptive text for the inder option */ -#define INDER_DESC (certtool_opt_strs+5503) +#define INDER_DESC (certtool_opt_strs+5216) /** Upper-cased name for the inder option */ -#define INDER_NAME (certtool_opt_strs+5574) +#define INDER_NAME (certtool_opt_strs+5287) /** disablement name for the inder option */ -#define NOT_INDER_name (certtool_opt_strs+5580) +#define NOT_INDER_name (certtool_opt_strs+5293) /** disablement prefix for the inder option */ -#define NOT_INDER_PFX (certtool_opt_strs+4429) +#define NOT_INDER_PFX (certtool_opt_strs+4225) /** Name string for the inder option */ #define INDER_name (NOT_INDER_name + 3) /** Compiled in flag settings for the inder option */ @@ -1279,10 +1234,10 @@ static int const aVerify_EmailCantList[] = { * inraw option description: */ /** Descriptive text for the inraw option */ -#define INRAW_DESC (certtool_opt_strs+5589) +#define INRAW_DESC (certtool_opt_strs+5302) #define INRAW_NAME NULL /** Unmodified name string for the inraw option */ -#define INRAW_name (certtool_opt_strs+5621) +#define INRAW_name (certtool_opt_strs+5334) /** Compiled in flag settings for the inraw option */ #define INRAW_FLAGS (INDER_FLAGS | OPTST_ALIAS) @@ -1290,13 +1245,13 @@ static int const aVerify_EmailCantList[] = { * outder option description: */ /** Descriptive text for the outder option */ -#define OUTDER_DESC (certtool_opt_strs+5627) +#define OUTDER_DESC (certtool_opt_strs+5340) /** Upper-cased name for the outder option */ -#define OUTDER_NAME (certtool_opt_strs+5699) +#define OUTDER_NAME (certtool_opt_strs+5412) /** disablement name for the outder option */ -#define NOT_OUTDER_name (certtool_opt_strs+5706) +#define NOT_OUTDER_name (certtool_opt_strs+5419) /** disablement prefix for the outder option */ -#define NOT_OUTDER_PFX (certtool_opt_strs+4429) +#define NOT_OUTDER_PFX (certtool_opt_strs+4225) /** Name string for the outder option */ #define OUTDER_name (NOT_OUTDER_name + 3) /** Compiled in flag settings for the outder option */ @@ -1306,10 +1261,10 @@ static int const aVerify_EmailCantList[] = { * outraw option description: */ /** Descriptive text for the outraw option */ -#define OUTRAW_DESC (certtool_opt_strs+5716) +#define OUTRAW_DESC (certtool_opt_strs+5429) #define OUTRAW_NAME NULL /** Unmodified name string for the outraw option */ -#define OUTRAW_name (certtool_opt_strs+5749) +#define OUTRAW_name (certtool_opt_strs+5462) /** Compiled in flag settings for the outraw option */ #define OUTRAW_FLAGS (OUTDER_FLAGS | OPTST_ALIAS) @@ -1317,11 +1272,11 @@ static int const aVerify_EmailCantList[] = { * bits option description: */ /** Descriptive text for the bits option */ -#define BITS_DESC (certtool_opt_strs+5756) +#define BITS_DESC (certtool_opt_strs+5469) /** Upper-cased name for the bits option */ -#define BITS_NAME (certtool_opt_strs+5800) +#define BITS_NAME (certtool_opt_strs+5513) /** Name string for the bits option */ -#define BITS_name (certtool_opt_strs+5805) +#define BITS_name (certtool_opt_strs+5518) /** Compiled in flag settings for the bits option */ #define BITS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -1330,11 +1285,11 @@ static int const aVerify_EmailCantList[] = { * curve option description: */ /** Descriptive text for the curve option */ -#define CURVE_DESC (certtool_opt_strs+5810) +#define CURVE_DESC (certtool_opt_strs+5523) /** Upper-cased name for the curve option */ -#define CURVE_NAME (certtool_opt_strs+5855) +#define CURVE_NAME (certtool_opt_strs+5568) /** Name string for the curve option */ -#define CURVE_name (certtool_opt_strs+5861) +#define CURVE_name (certtool_opt_strs+5574) /** Compiled in flag settings for the curve option */ #define CURVE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1343,11 +1298,11 @@ static int const aVerify_EmailCantList[] = { * sec-param option description: */ /** Descriptive text for the sec-param option */ -#define SEC_PARAM_DESC (certtool_opt_strs+5867) +#define SEC_PARAM_DESC (certtool_opt_strs+5580) /** Upper-cased name for the sec-param option */ -#define SEC_PARAM_NAME (certtool_opt_strs+5929) +#define SEC_PARAM_NAME (certtool_opt_strs+5642) /** Name string for the sec-param option */ -#define SEC_PARAM_name (certtool_opt_strs+5939) +#define SEC_PARAM_name (certtool_opt_strs+5652) /** Compiled in flag settings for the sec-param option */ #define SEC_PARAM_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1356,11 +1311,11 @@ static int const aVerify_EmailCantList[] = { * disable-quick-random option description: */ /** Descriptive text for the disable-quick-random option */ -#define DISABLE_QUICK_RANDOM_DESC (certtool_opt_strs+5949) +#define DISABLE_QUICK_RANDOM_DESC (certtool_opt_strs+5662) /** Upper-cased name for the disable-quick-random option */ -#define DISABLE_QUICK_RANDOM_NAME (certtool_opt_strs+5972) +#define DISABLE_QUICK_RANDOM_NAME (certtool_opt_strs+5685) /** Name string for the disable-quick-random option */ -#define DISABLE_QUICK_RANDOM_name (certtool_opt_strs+5993) +#define DISABLE_QUICK_RANDOM_name (certtool_opt_strs+5706) /** Compiled in flag settings for the disable-quick-random option */ #define DISABLE_QUICK_RANDOM_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) @@ -1368,11 +1323,11 @@ static int const aVerify_EmailCantList[] = { * template option description: */ /** Descriptive text for the template option */ -#define TEMPLATE_DESC (certtool_opt_strs+6014) +#define TEMPLATE_DESC (certtool_opt_strs+5727) /** Upper-cased name for the template option */ -#define TEMPLATE_NAME (certtool_opt_strs+6065) +#define TEMPLATE_NAME (certtool_opt_strs+5778) /** Name string for the template option */ -#define TEMPLATE_name (certtool_opt_strs+6074) +#define TEMPLATE_name (certtool_opt_strs+5787) /** Compiled in flag settings for the template option */ #define TEMPLATE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1381,11 +1336,11 @@ static int const aVerify_EmailCantList[] = { * stdout-info option description: */ /** Descriptive text for the stdout-info option */ -#define STDOUT_INFO_DESC (certtool_opt_strs+6083) +#define STDOUT_INFO_DESC (certtool_opt_strs+5796) /** Upper-cased name for the stdout-info option */ -#define STDOUT_INFO_NAME (certtool_opt_strs+6129) +#define STDOUT_INFO_NAME (certtool_opt_strs+5842) /** Name string for the stdout-info option */ -#define STDOUT_INFO_name (certtool_opt_strs+6141) +#define STDOUT_INFO_name (certtool_opt_strs+5854) /** Compiled in flag settings for the stdout-info option */ #define STDOUT_INFO_FLAGS (OPTST_DISABLED) @@ -1393,11 +1348,11 @@ static int const aVerify_EmailCantList[] = { * ask-pass option description: */ /** Descriptive text for the ask-pass option */ -#define ASK_PASS_DESC (certtool_opt_strs+6153) +#define ASK_PASS_DESC (certtool_opt_strs+5866) /** Upper-cased name for the ask-pass option */ -#define ASK_PASS_NAME (certtool_opt_strs+6214) +#define ASK_PASS_NAME (certtool_opt_strs+5927) /** Name string for the ask-pass option */ -#define ASK_PASS_name (certtool_opt_strs+6223) +#define ASK_PASS_name (certtool_opt_strs+5936) /** Compiled in flag settings for the ask-pass option */ #define ASK_PASS_FLAGS (OPTST_DISABLED) @@ -1405,11 +1360,11 @@ static int const aVerify_EmailCantList[] = { * pkcs-cipher option description: */ /** Descriptive text for the pkcs-cipher option */ -#define PKCS_CIPHER_DESC (certtool_opt_strs+6232) +#define PKCS_CIPHER_DESC (certtool_opt_strs+5945) /** Upper-cased name for the pkcs-cipher option */ -#define PKCS_CIPHER_NAME (certtool_opt_strs+6277) +#define PKCS_CIPHER_NAME (certtool_opt_strs+5990) /** Name string for the pkcs-cipher option */ -#define PKCS_CIPHER_name (certtool_opt_strs+6289) +#define PKCS_CIPHER_name (certtool_opt_strs+6002) /** Compiled in flag settings for the pkcs-cipher option */ #define PKCS_CIPHER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1418,11 +1373,11 @@ static int const aVerify_EmailCantList[] = { * provider option description: */ /** Descriptive text for the provider option */ -#define PROVIDER_DESC (certtool_opt_strs+6301) +#define PROVIDER_DESC (certtool_opt_strs+6014) /** Upper-cased name for the provider option */ -#define PROVIDER_NAME (certtool_opt_strs+6339) +#define PROVIDER_NAME (certtool_opt_strs+6052) /** Name string for the provider option */ -#define PROVIDER_name (certtool_opt_strs+6348) +#define PROVIDER_name (certtool_opt_strs+6061) /** Compiled in flag settings for the provider option */ #define PROVIDER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1430,11 +1385,11 @@ static int const aVerify_EmailCantList[] = { /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (certtool_opt_strs+6357) -#define HELP_name (certtool_opt_strs+6401) +#define HELP_DESC (certtool_opt_strs+6070) +#define HELP_name (certtool_opt_strs+6114) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (certtool_opt_strs+6406) -#define MORE_HELP_name (certtool_opt_strs+6451) +#define MORE_HELP_DESC (certtool_opt_strs+6119) +#define MORE_HELP_name (certtool_opt_strs+6164) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -1447,8 +1402,8 @@ static int const aVerify_EmailCantList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (certtool_opt_strs+6461) -#define VER_name (certtool_opt_strs+6497) +#define VER_DESC (certtool_opt_strs+6174) +#define VER_name (certtool_opt_strs+6210) /** * Declare option callback procedures */ @@ -1961,32 +1916,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ CERTIFICATE_PUBKEY_DESC, CERTIFICATE_PUBKEY_NAME, CERTIFICATE_PUBKEY_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 41, VALUE_OPT_PGP_CERTIFICATE_INFO, - /* equiv idx, value */ 41, VALUE_OPT_PGP_CERTIFICATE_INFO, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PGP_CERTIFICATE_INFO_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --pgp-certificate-info */ - /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, - /* option proc */ NULL, - /* desc, NAME, name */ PGP_CERTIFICATE_INFO_DESC, PGP_CERTIFICATE_INFO_NAME, PGP_CERTIFICATE_INFO_name, - /* disablement strs */ NULL, NULL }, - - { /* entry idx, value */ 42, VALUE_OPT_PGP_RING_INFO, - /* equiv idx, value */ 42, VALUE_OPT_PGP_RING_INFO, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PGP_RING_INFO_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --pgp-ring-info */ - /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, - /* option proc */ NULL, - /* desc, NAME, name */ PGP_RING_INFO_DESC, PGP_RING_INFO_NAME, PGP_RING_INFO_name, - /* disablement strs */ NULL, NULL }, - - { /* entry idx, value */ 43, VALUE_OPT_CRL_INFO, - /* equiv idx, value */ 43, VALUE_OPT_CRL_INFO, + { /* entry idx, value */ 41, VALUE_OPT_CRL_INFO, + /* equiv idx, value */ 41, VALUE_OPT_CRL_INFO, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ CRL_INFO_FLAGS, 0, @@ -1997,8 +1928,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ CRL_INFO_DESC, CRL_INFO_NAME, CRL_INFO_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 44, VALUE_OPT_CRQ_INFO, - /* equiv idx, value */ 44, VALUE_OPT_CRQ_INFO, + { /* entry idx, value */ 42, VALUE_OPT_CRQ_INFO, + /* equiv idx, value */ 42, VALUE_OPT_CRQ_INFO, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ CRQ_INFO_FLAGS, 0, @@ -2009,8 +1940,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ CRQ_INFO_DESC, CRQ_INFO_NAME, CRQ_INFO_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 45, VALUE_OPT_NO_CRQ_EXTENSIONS, - /* equiv idx, value */ 45, VALUE_OPT_NO_CRQ_EXTENSIONS, + { /* entry idx, value */ 43, VALUE_OPT_NO_CRQ_EXTENSIONS, + /* equiv idx, value */ 43, VALUE_OPT_NO_CRQ_EXTENSIONS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NO_CRQ_EXTENSIONS_FLAGS, 0, @@ -2021,8 +1952,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ NO_CRQ_EXTENSIONS_DESC, NO_CRQ_EXTENSIONS_NAME, NO_CRQ_EXTENSIONS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 46, VALUE_OPT_P12_INFO, - /* equiv idx, value */ 46, VALUE_OPT_P12_INFO, + { /* entry idx, value */ 44, VALUE_OPT_P12_INFO, + /* equiv idx, value */ 44, VALUE_OPT_P12_INFO, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ P12_INFO_FLAGS, 0, @@ -2033,8 +1964,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ P12_INFO_DESC, P12_INFO_NAME, P12_INFO_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 47, VALUE_OPT_P12_NAME, - /* equiv idx, value */ 47, VALUE_OPT_P12_NAME, + { /* entry idx, value */ 45, VALUE_OPT_P12_NAME, + /* equiv idx, value */ 45, VALUE_OPT_P12_NAME, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ P12_NAME_FLAGS, 0, @@ -2045,8 +1976,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ P12_NAME_DESC, P12_NAME_NAME, P12_NAME_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 48, VALUE_OPT_P7_GENERATE, - /* equiv idx, value */ 48, VALUE_OPT_P7_GENERATE, + { /* entry idx, value */ 46, VALUE_OPT_P7_GENERATE, + /* equiv idx, value */ 46, VALUE_OPT_P7_GENERATE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ P7_GENERATE_FLAGS, 0, @@ -2057,8 +1988,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ P7_GENERATE_DESC, P7_GENERATE_NAME, P7_GENERATE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 49, VALUE_OPT_P7_SIGN, - /* equiv idx, value */ 49, VALUE_OPT_P7_SIGN, + { /* entry idx, value */ 47, VALUE_OPT_P7_SIGN, + /* equiv idx, value */ 47, VALUE_OPT_P7_SIGN, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ P7_SIGN_FLAGS, 0, @@ -2069,8 +2000,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ P7_SIGN_DESC, P7_SIGN_NAME, P7_SIGN_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 50, VALUE_OPT_P7_DETACHED_SIGN, - /* equiv idx, value */ 50, VALUE_OPT_P7_DETACHED_SIGN, + { /* entry idx, value */ 48, VALUE_OPT_P7_DETACHED_SIGN, + /* equiv idx, value */ 48, VALUE_OPT_P7_DETACHED_SIGN, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ P7_DETACHED_SIGN_FLAGS, 0, @@ -2081,8 +2012,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ P7_DETACHED_SIGN_DESC, P7_DETACHED_SIGN_NAME, P7_DETACHED_SIGN_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 51, VALUE_OPT_P7_INCLUDE_CERT, - /* equiv idx, value */ 51, VALUE_OPT_P7_INCLUDE_CERT, + { /* entry idx, value */ 49, VALUE_OPT_P7_INCLUDE_CERT, + /* equiv idx, value */ 49, VALUE_OPT_P7_INCLUDE_CERT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ P7_INCLUDE_CERT_FLAGS, 0, @@ -2093,8 +2024,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ P7_INCLUDE_CERT_DESC, P7_INCLUDE_CERT_NAME, P7_INCLUDE_CERT_name, /* disablement strs */ NOT_P7_INCLUDE_CERT_name, NOT_P7_INCLUDE_CERT_PFX }, - { /* entry idx, value */ 52, VALUE_OPT_P7_TIME, - /* equiv idx, value */ 52, VALUE_OPT_P7_TIME, + { /* entry idx, value */ 50, VALUE_OPT_P7_TIME, + /* equiv idx, value */ 50, VALUE_OPT_P7_TIME, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ P7_TIME_FLAGS, 0, @@ -2105,8 +2036,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ P7_TIME_DESC, P7_TIME_NAME, P7_TIME_name, /* disablement strs */ NOT_P7_TIME_name, NOT_P7_TIME_PFX }, - { /* entry idx, value */ 53, VALUE_OPT_P7_SHOW_DATA, - /* equiv idx, value */ 53, VALUE_OPT_P7_SHOW_DATA, + { /* entry idx, value */ 51, VALUE_OPT_P7_SHOW_DATA, + /* equiv idx, value */ 51, VALUE_OPT_P7_SHOW_DATA, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ P7_SHOW_DATA_FLAGS, 0, @@ -2117,8 +2048,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ P7_SHOW_DATA_DESC, P7_SHOW_DATA_NAME, P7_SHOW_DATA_name, /* disablement strs */ NOT_P7_SHOW_DATA_name, NOT_P7_SHOW_DATA_PFX }, - { /* entry idx, value */ 54, VALUE_OPT_P7_INFO, - /* equiv idx, value */ 54, VALUE_OPT_P7_INFO, + { /* entry idx, value */ 52, VALUE_OPT_P7_INFO, + /* equiv idx, value */ 52, VALUE_OPT_P7_INFO, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ P7_INFO_FLAGS, 0, @@ -2129,8 +2060,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ P7_INFO_DESC, P7_INFO_NAME, P7_INFO_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 55, VALUE_OPT_P7_VERIFY, - /* equiv idx, value */ 55, VALUE_OPT_P7_VERIFY, + { /* entry idx, value */ 53, VALUE_OPT_P7_VERIFY, + /* equiv idx, value */ 53, VALUE_OPT_P7_VERIFY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ P7_VERIFY_FLAGS, 0, @@ -2141,8 +2072,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ P7_VERIFY_DESC, P7_VERIFY_NAME, P7_VERIFY_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 56, VALUE_OPT_P8_INFO, - /* equiv idx, value */ 56, VALUE_OPT_P8_INFO, + { /* entry idx, value */ 54, VALUE_OPT_P8_INFO, + /* equiv idx, value */ 54, VALUE_OPT_P8_INFO, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ P8_INFO_FLAGS, 0, @@ -2153,8 +2084,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ P8_INFO_DESC, P8_INFO_NAME, P8_INFO_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 57, VALUE_OPT_SMIME_TO_P7, - /* equiv idx, value */ 57, VALUE_OPT_SMIME_TO_P7, + { /* entry idx, value */ 55, VALUE_OPT_SMIME_TO_P7, + /* equiv idx, value */ 55, VALUE_OPT_SMIME_TO_P7, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SMIME_TO_P7_FLAGS, 0, @@ -2165,8 +2096,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SMIME_TO_P7_DESC, SMIME_TO_P7_NAME, SMIME_TO_P7_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 58, VALUE_OPT_KEY_INFO, - /* equiv idx, value */ 58, VALUE_OPT_KEY_INFO, + { /* entry idx, value */ 56, VALUE_OPT_KEY_INFO, + /* equiv idx, value */ 56, VALUE_OPT_KEY_INFO, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ KEY_INFO_FLAGS, 0, @@ -2177,20 +2108,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ KEY_INFO_DESC, KEY_INFO_NAME, KEY_INFO_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 59, VALUE_OPT_PGP_KEY_INFO, - /* equiv idx, value */ 59, VALUE_OPT_PGP_KEY_INFO, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PGP_KEY_INFO_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --pgp-key-info */ - /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, - /* option proc */ NULL, - /* desc, NAME, name */ PGP_KEY_INFO_DESC, PGP_KEY_INFO_NAME, PGP_KEY_INFO_name, - /* disablement strs */ NULL, NULL }, - - { /* entry idx, value */ 60, VALUE_OPT_PUBKEY_INFO, - /* equiv idx, value */ 60, VALUE_OPT_PUBKEY_INFO, + { /* entry idx, value */ 57, VALUE_OPT_PUBKEY_INFO, + /* equiv idx, value */ 57, VALUE_OPT_PUBKEY_INFO, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PUBKEY_INFO_FLAGS, 0, @@ -2201,8 +2120,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PUBKEY_INFO_DESC, PUBKEY_INFO_NAME, PUBKEY_INFO_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 61, VALUE_OPT_V1, - /* equiv idx, value */ 61, VALUE_OPT_V1, + { /* entry idx, value */ 58, VALUE_OPT_V1, + /* equiv idx, value */ 58, VALUE_OPT_V1, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ V1_FLAGS, 0, @@ -2213,8 +2132,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ V1_DESC, V1_NAME, V1_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 62, VALUE_OPT_TO_P12, - /* equiv idx, value */ 62, VALUE_OPT_TO_P12, + { /* entry idx, value */ 59, VALUE_OPT_TO_P12, + /* equiv idx, value */ 59, VALUE_OPT_TO_P12, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ TO_P12_FLAGS, 0, @@ -2225,8 +2144,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ TO_P12_DESC, TO_P12_NAME, TO_P12_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 63, VALUE_OPT_TO_P8, - /* equiv idx, value */ 63, VALUE_OPT_TO_P8, + { /* entry idx, value */ 60, VALUE_OPT_TO_P8, + /* equiv idx, value */ 60, VALUE_OPT_TO_P8, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ TO_P8_FLAGS, 0, @@ -2237,8 +2156,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ TO_P8_DESC, TO_P8_NAME, TO_P8_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 64, VALUE_OPT_PKCS8, - /* equiv idx, value */ 64, VALUE_OPT_PKCS8, + { /* entry idx, value */ 61, VALUE_OPT_PKCS8, + /* equiv idx, value */ 61, VALUE_OPT_PKCS8, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PKCS8_FLAGS, 0, @@ -2249,8 +2168,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PKCS8_DESC, PKCS8_NAME, PKCS8_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 65, VALUE_OPT_RSA, - /* equiv idx, value */ 65, VALUE_OPT_RSA, + { /* entry idx, value */ 62, VALUE_OPT_RSA, + /* equiv idx, value */ 62, VALUE_OPT_RSA, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ RSA_FLAGS, 0, @@ -2261,8 +2180,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ RSA_DESC, RSA_NAME, RSA_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 66, VALUE_OPT_DSA, - /* equiv idx, value */ 66, VALUE_OPT_DSA, + { /* entry idx, value */ 63, VALUE_OPT_DSA, + /* equiv idx, value */ 63, VALUE_OPT_DSA, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ DSA_FLAGS, 0, @@ -2273,8 +2192,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ DSA_DESC, DSA_NAME, DSA_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 67, VALUE_OPT_ECC, - /* equiv idx, value */ 67, VALUE_OPT_ECC, + { /* entry idx, value */ 64, VALUE_OPT_ECC, + /* equiv idx, value */ 64, VALUE_OPT_ECC, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ ECC_FLAGS, 0, @@ -2285,8 +2204,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ ECC_DESC, ECC_NAME, ECC_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 68, VALUE_OPT_ECDSA, - /* equiv idx, value */ 68, VALUE_OPT_ECDSA, + { /* entry idx, value */ 65, VALUE_OPT_ECDSA, + /* equiv idx, value */ 65, VALUE_OPT_ECDSA, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ ECDSA_FLAGS, 0, @@ -2297,8 +2216,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ ECDSA_DESC, ECDSA_NAME, ECDSA_name, /* disablement strs */ 0, 0 }, - { /* entry idx, value */ 69, VALUE_OPT_RSA_PSS, - /* equiv idx, value */ 69, VALUE_OPT_RSA_PSS, + { /* entry idx, value */ 66, VALUE_OPT_RSA_PSS, + /* equiv idx, value */ 66, VALUE_OPT_RSA_PSS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ RSA_PSS_FLAGS, 0, @@ -2309,8 +2228,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ RSA_PSS_DESC, RSA_PSS_NAME, RSA_PSS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 70, VALUE_OPT_SIGN_PARAMS, - /* equiv idx, value */ 70, VALUE_OPT_SIGN_PARAMS, + { /* entry idx, value */ 67, VALUE_OPT_SIGN_PARAMS, + /* equiv idx, value */ 67, VALUE_OPT_SIGN_PARAMS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SIGN_PARAMS_FLAGS, 0, @@ -2321,8 +2240,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SIGN_PARAMS_DESC, SIGN_PARAMS_NAME, SIGN_PARAMS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 71, VALUE_OPT_HASH, - /* equiv idx, value */ 71, VALUE_OPT_HASH, + { /* entry idx, value */ 68, VALUE_OPT_HASH, + /* equiv idx, value */ 68, VALUE_OPT_HASH, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ HASH_FLAGS, 0, @@ -2333,8 +2252,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ HASH_DESC, HASH_NAME, HASH_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 72, VALUE_OPT_INDER, - /* equiv idx, value */ 72, VALUE_OPT_INDER, + { /* entry idx, value */ 69, VALUE_OPT_INDER, + /* equiv idx, value */ 69, VALUE_OPT_INDER, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ INDER_FLAGS, 0, @@ -2345,8 +2264,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ INDER_DESC, INDER_NAME, INDER_name, /* disablement strs */ NOT_INDER_name, NOT_INDER_PFX }, - { /* entry idx, value */ 73, VALUE_OPT_INRAW, - /* equiv idx, value */ 73, VALUE_OPT_INRAW, + { /* entry idx, value */ 70, VALUE_OPT_INRAW, + /* equiv idx, value */ 70, VALUE_OPT_INRAW, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ INRAW_FLAGS, 0, @@ -2357,8 +2276,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ INRAW_DESC, INRAW_NAME, INRAW_name, /* disablement strs */ 0, 0 }, - { /* entry idx, value */ 74, VALUE_OPT_OUTDER, - /* equiv idx, value */ 74, VALUE_OPT_OUTDER, + { /* entry idx, value */ 71, VALUE_OPT_OUTDER, + /* equiv idx, value */ 71, VALUE_OPT_OUTDER, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OUTDER_FLAGS, 0, @@ -2369,8 +2288,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ OUTDER_DESC, OUTDER_NAME, OUTDER_name, /* disablement strs */ NOT_OUTDER_name, NOT_OUTDER_PFX }, - { /* entry idx, value */ 75, VALUE_OPT_OUTRAW, - /* equiv idx, value */ 75, VALUE_OPT_OUTRAW, + { /* entry idx, value */ 72, VALUE_OPT_OUTRAW, + /* equiv idx, value */ 72, VALUE_OPT_OUTRAW, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OUTRAW_FLAGS, 0, @@ -2381,8 +2300,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ OUTRAW_DESC, OUTRAW_NAME, OUTRAW_name, /* disablement strs */ 0, 0 }, - { /* entry idx, value */ 76, VALUE_OPT_BITS, - /* equiv idx, value */ 76, VALUE_OPT_BITS, + { /* entry idx, value */ 73, VALUE_OPT_BITS, + /* equiv idx, value */ 73, VALUE_OPT_BITS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ BITS_FLAGS, 0, @@ -2393,8 +2312,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ BITS_DESC, BITS_NAME, BITS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 77, VALUE_OPT_CURVE, - /* equiv idx, value */ 77, VALUE_OPT_CURVE, + { /* entry idx, value */ 74, VALUE_OPT_CURVE, + /* equiv idx, value */ 74, VALUE_OPT_CURVE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ CURVE_FLAGS, 0, @@ -2405,8 +2324,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ CURVE_DESC, CURVE_NAME, CURVE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 78, VALUE_OPT_SEC_PARAM, - /* equiv idx, value */ 78, VALUE_OPT_SEC_PARAM, + { /* entry idx, value */ 75, VALUE_OPT_SEC_PARAM, + /* equiv idx, value */ 75, VALUE_OPT_SEC_PARAM, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SEC_PARAM_FLAGS, 0, @@ -2417,8 +2336,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SEC_PARAM_DESC, SEC_PARAM_NAME, SEC_PARAM_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 79, VALUE_OPT_DISABLE_QUICK_RANDOM, - /* equiv idx, value */ 79, VALUE_OPT_DISABLE_QUICK_RANDOM, + { /* entry idx, value */ 76, VALUE_OPT_DISABLE_QUICK_RANDOM, + /* equiv idx, value */ 76, VALUE_OPT_DISABLE_QUICK_RANDOM, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ DISABLE_QUICK_RANDOM_FLAGS, 0, @@ -2429,8 +2348,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ DISABLE_QUICK_RANDOM_DESC, DISABLE_QUICK_RANDOM_NAME, DISABLE_QUICK_RANDOM_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 80, VALUE_OPT_TEMPLATE, - /* equiv idx, value */ 80, VALUE_OPT_TEMPLATE, + { /* entry idx, value */ 77, VALUE_OPT_TEMPLATE, + /* equiv idx, value */ 77, VALUE_OPT_TEMPLATE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ TEMPLATE_FLAGS, 0, @@ -2441,8 +2360,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ TEMPLATE_DESC, TEMPLATE_NAME, TEMPLATE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 81, VALUE_OPT_STDOUT_INFO, - /* equiv idx, value */ 81, VALUE_OPT_STDOUT_INFO, + { /* entry idx, value */ 78, VALUE_OPT_STDOUT_INFO, + /* equiv idx, value */ 78, VALUE_OPT_STDOUT_INFO, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ STDOUT_INFO_FLAGS, 0, @@ -2453,8 +2372,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ STDOUT_INFO_DESC, STDOUT_INFO_NAME, STDOUT_INFO_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 82, VALUE_OPT_ASK_PASS, - /* equiv idx, value */ 82, VALUE_OPT_ASK_PASS, + { /* entry idx, value */ 79, VALUE_OPT_ASK_PASS, + /* equiv idx, value */ 79, VALUE_OPT_ASK_PASS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ ASK_PASS_FLAGS, 0, @@ -2465,8 +2384,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ ASK_PASS_DESC, ASK_PASS_NAME, ASK_PASS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 83, VALUE_OPT_PKCS_CIPHER, - /* equiv idx, value */ 83, VALUE_OPT_PKCS_CIPHER, + { /* entry idx, value */ 80, VALUE_OPT_PKCS_CIPHER, + /* equiv idx, value */ 80, VALUE_OPT_PKCS_CIPHER, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PKCS_CIPHER_FLAGS, 0, @@ -2477,8 +2396,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PKCS_CIPHER_DESC, PKCS_CIPHER_NAME, PKCS_CIPHER_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 84, VALUE_OPT_PROVIDER, - /* equiv idx, value */ 84, VALUE_OPT_PROVIDER, + { /* entry idx, value */ 81, VALUE_OPT_PROVIDER, + /* equiv idx, value */ 81, VALUE_OPT_PROVIDER, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PROVIDER_FLAGS, 0, @@ -2531,21 +2450,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of certtool. */ -#define zPROGNAME (certtool_opt_strs+6505) +#define zPROGNAME (certtool_opt_strs+6218) /** Reference to the title line for certtool usage. */ -#define zUsageTitle (certtool_opt_strs+6514) +#define zUsageTitle (certtool_opt_strs+6227) /** There is no certtool configuration file. */ #define zRcName NULL /** There are no directories to search for certtool config files. */ #define apzHomeList NULL /** The certtool program bug email address. */ -#define zBugsAddr (certtool_opt_strs+6607) +#define zBugsAddr (certtool_opt_strs+6320) /** Clarification/explanation of what certtool does. */ -#define zExplain (certtool_opt_strs+6627) +#define zExplain (certtool_opt_strs+6340) /** Extra detail explaining what certtool does. */ -#define zDetail (certtool_opt_strs+6629) +#define zDetail (certtool_opt_strs+6342) /** The full version string for certtool. */ -#define zFullVersion (certtool_opt_strs+6990) +#define zFullVersion (certtool_opt_strs+6703) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -2557,7 +2476,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define certtool_full_usage (NULL) -#define certtool_short_usage (certtool_opt_strs+7009) +#define certtool_short_usage (certtool_opt_strs+6722) #endif /* not defined __doxygen__ */ @@ -2754,7 +2673,7 @@ tOptions certtoolOptions = { NO_EQUIVALENT, /* '-#' option index */ NO_EQUIVALENT /* index of default opt */ }, - 88 /* full option count */, 85 /* user option count */, + 85 /* full option count */, 82 /* user option count */, certtool_full_usage, certtool_short_usage, NULL, NULL, PKGDATADIR, certtool_packager_info @@ -3031,12 +2950,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.\n")); puts(_("Print certificate's public key")); /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on the given OpenPGP certificate (deprecated)")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on the given OpenPGP keyring structure (deprecated)")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ puts(_("Print information on the given CRL structure")); /* referenced via certtoolOptions.pOptDesc->pzText */ @@ -3085,9 +2998,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.\n")); puts(_("Print information on a private key")); /* referenced via certtoolOptions.pOptDesc->pzText */ - puts(_("Print information on an OpenPGP private key (deprecated)")); - - /* referenced via certtoolOptions.pOptDesc->pzText */ puts(_("Print information on a public key")); /* referenced via certtoolOptions.pOptDesc->pzText */ diff --git a/src/certtool-args.h.bak b/src/certtool-args.h.bak index 218299d311..c780107a5c 100644 --- a/src/certtool-args.h.bak +++ b/src/certtool-args.h.bak @@ -107,56 +107,53 @@ typedef enum { INDEX_OPT_FINGERPRINT = 38, INDEX_OPT_KEY_ID = 39, INDEX_OPT_CERTIFICATE_PUBKEY = 40, - INDEX_OPT_PGP_CERTIFICATE_INFO = 41, - INDEX_OPT_PGP_RING_INFO = 42, - INDEX_OPT_CRL_INFO = 43, - INDEX_OPT_CRQ_INFO = 44, - INDEX_OPT_NO_CRQ_EXTENSIONS = 45, - INDEX_OPT_P12_INFO = 46, - INDEX_OPT_P12_NAME = 47, - INDEX_OPT_P7_GENERATE = 48, - INDEX_OPT_P7_SIGN = 49, - INDEX_OPT_P7_DETACHED_SIGN = 50, - INDEX_OPT_P7_INCLUDE_CERT = 51, - INDEX_OPT_P7_TIME = 52, - INDEX_OPT_P7_SHOW_DATA = 53, - INDEX_OPT_P7_INFO = 54, - INDEX_OPT_P7_VERIFY = 55, - INDEX_OPT_P8_INFO = 56, - INDEX_OPT_SMIME_TO_P7 = 57, - INDEX_OPT_KEY_INFO = 58, - INDEX_OPT_PGP_KEY_INFO = 59, - INDEX_OPT_PUBKEY_INFO = 60, - INDEX_OPT_V1 = 61, - INDEX_OPT_TO_P12 = 62, - INDEX_OPT_TO_P8 = 63, - INDEX_OPT_PKCS8 = 64, - INDEX_OPT_RSA = 65, - INDEX_OPT_DSA = 66, - INDEX_OPT_ECC = 67, - INDEX_OPT_ECDSA = 68, - INDEX_OPT_RSA_PSS = 69, - INDEX_OPT_SIGN_PARAMS = 70, - INDEX_OPT_HASH = 71, - INDEX_OPT_INDER = 72, - INDEX_OPT_INRAW = 73, - INDEX_OPT_OUTDER = 74, - INDEX_OPT_OUTRAW = 75, - INDEX_OPT_BITS = 76, - INDEX_OPT_CURVE = 77, - INDEX_OPT_SEC_PARAM = 78, - INDEX_OPT_DISABLE_QUICK_RANDOM = 79, - INDEX_OPT_TEMPLATE = 80, - INDEX_OPT_STDOUT_INFO = 81, - INDEX_OPT_ASK_PASS = 82, - INDEX_OPT_PKCS_CIPHER = 83, - INDEX_OPT_PROVIDER = 84, - INDEX_OPT_VERSION = 85, - INDEX_OPT_HELP = 86, - INDEX_OPT_MORE_HELP = 87 + INDEX_OPT_CRL_INFO = 41, + INDEX_OPT_CRQ_INFO = 42, + INDEX_OPT_NO_CRQ_EXTENSIONS = 43, + INDEX_OPT_P12_INFO = 44, + INDEX_OPT_P12_NAME = 45, + INDEX_OPT_P7_GENERATE = 46, + INDEX_OPT_P7_SIGN = 47, + INDEX_OPT_P7_DETACHED_SIGN = 48, + INDEX_OPT_P7_INCLUDE_CERT = 49, + INDEX_OPT_P7_TIME = 50, + INDEX_OPT_P7_SHOW_DATA = 51, + INDEX_OPT_P7_INFO = 52, + INDEX_OPT_P7_VERIFY = 53, + INDEX_OPT_P8_INFO = 54, + INDEX_OPT_SMIME_TO_P7 = 55, + INDEX_OPT_KEY_INFO = 56, + INDEX_OPT_PUBKEY_INFO = 57, + INDEX_OPT_V1 = 58, + INDEX_OPT_TO_P12 = 59, + INDEX_OPT_TO_P8 = 60, + INDEX_OPT_PKCS8 = 61, + INDEX_OPT_RSA = 62, + INDEX_OPT_DSA = 63, + INDEX_OPT_ECC = 64, + INDEX_OPT_ECDSA = 65, + INDEX_OPT_RSA_PSS = 66, + INDEX_OPT_SIGN_PARAMS = 67, + INDEX_OPT_HASH = 68, + INDEX_OPT_INDER = 69, + INDEX_OPT_INRAW = 70, + INDEX_OPT_OUTDER = 71, + INDEX_OPT_OUTRAW = 72, + INDEX_OPT_BITS = 73, + INDEX_OPT_CURVE = 74, + INDEX_OPT_SEC_PARAM = 75, + INDEX_OPT_DISABLE_QUICK_RANDOM = 76, + INDEX_OPT_TEMPLATE = 77, + INDEX_OPT_STDOUT_INFO = 78, + INDEX_OPT_ASK_PASS = 79, + INDEX_OPT_PKCS_CIPHER = 80, + INDEX_OPT_PROVIDER = 81, + INDEX_OPT_VERSION = 82, + INDEX_OPT_HELP = 83, + INDEX_OPT_MORE_HELP = 84 } teOptIndex; /** count of all options for certtool */ -#define OPTION_CT 88 +#define OPTION_CT 85 /** certtool version */ #define CERTTOOL_VERSION "@VERSION@" /** Full certtool version text */ @@ -254,52 +251,49 @@ typedef enum { #define VALUE_OPT_FINGERPRINT 0x101E #define VALUE_OPT_KEY_ID 0x101F #define VALUE_OPT_CERTIFICATE_PUBKEY 0x1020 -#define VALUE_OPT_PGP_CERTIFICATE_INFO 0x1021 -#define VALUE_OPT_PGP_RING_INFO 0x1022 #define VALUE_OPT_CRL_INFO 'l' -#define VALUE_OPT_CRQ_INFO 0x1023 -#define VALUE_OPT_NO_CRQ_EXTENSIONS 0x1024 -#define VALUE_OPT_P12_INFO 0x1025 -#define VALUE_OPT_P12_NAME 0x1026 -#define VALUE_OPT_P7_GENERATE 0x1027 -#define VALUE_OPT_P7_SIGN 0x1028 -#define VALUE_OPT_P7_DETACHED_SIGN 0x1029 -#define VALUE_OPT_P7_INCLUDE_CERT 0x102A -#define VALUE_OPT_P7_TIME 0x102B -#define VALUE_OPT_P7_SHOW_DATA 0x102C -#define VALUE_OPT_P7_INFO 0x102D -#define VALUE_OPT_P7_VERIFY 0x102E -#define VALUE_OPT_P8_INFO 0x102F -#define VALUE_OPT_SMIME_TO_P7 0x1030 +#define VALUE_OPT_CRQ_INFO 0x1021 +#define VALUE_OPT_NO_CRQ_EXTENSIONS 0x1022 +#define VALUE_OPT_P12_INFO 0x1023 +#define VALUE_OPT_P12_NAME 0x1024 +#define VALUE_OPT_P7_GENERATE 0x1025 +#define VALUE_OPT_P7_SIGN 0x1026 +#define VALUE_OPT_P7_DETACHED_SIGN 0x1027 +#define VALUE_OPT_P7_INCLUDE_CERT 0x1028 +#define VALUE_OPT_P7_TIME 0x1029 +#define VALUE_OPT_P7_SHOW_DATA 0x102A +#define VALUE_OPT_P7_INFO 0x102B +#define VALUE_OPT_P7_VERIFY 0x102C +#define VALUE_OPT_P8_INFO 0x102D +#define VALUE_OPT_SMIME_TO_P7 0x102E #define VALUE_OPT_KEY_INFO 'k' -#define VALUE_OPT_PGP_KEY_INFO 0x1031 -#define VALUE_OPT_PUBKEY_INFO 0x1032 -#define VALUE_OPT_V1 0x1033 -#define VALUE_OPT_TO_P12 0x1034 -#define VALUE_OPT_TO_P8 0x1035 +#define VALUE_OPT_PUBKEY_INFO 0x102F +#define VALUE_OPT_V1 0x1030 +#define VALUE_OPT_TO_P12 0x1031 +#define VALUE_OPT_TO_P8 0x1032 #define VALUE_OPT_PKCS8 '8' -#define VALUE_OPT_RSA 0x1036 -#define VALUE_OPT_DSA 0x1037 -#define VALUE_OPT_ECC 0x1038 -#define VALUE_OPT_ECDSA 0x1039 -#define VALUE_OPT_RSA_PSS 0x103A -#define VALUE_OPT_SIGN_PARAMS 0x103B -#define VALUE_OPT_HASH 0x103C -#define VALUE_OPT_INDER 0x103D -#define VALUE_OPT_INRAW 0x103E -#define VALUE_OPT_OUTDER 0x103F -#define VALUE_OPT_OUTRAW 0x1040 -#define VALUE_OPT_BITS 0x1041 +#define VALUE_OPT_RSA 0x1033 +#define VALUE_OPT_DSA 0x1034 +#define VALUE_OPT_ECC 0x1035 +#define VALUE_OPT_ECDSA 0x1036 +#define VALUE_OPT_RSA_PSS 0x1037 +#define VALUE_OPT_SIGN_PARAMS 0x1038 +#define VALUE_OPT_HASH 0x1039 +#define VALUE_OPT_INDER 0x103A +#define VALUE_OPT_INRAW 0x103B +#define VALUE_OPT_OUTDER 0x103C +#define VALUE_OPT_OUTRAW 0x103D +#define VALUE_OPT_BITS 0x103E #define OPT_VALUE_BITS (DESC(BITS).optArg.argInt) -#define VALUE_OPT_CURVE 0x1042 -#define VALUE_OPT_SEC_PARAM 0x1043 -#define VALUE_OPT_DISABLE_QUICK_RANDOM 0x1044 -#define VALUE_OPT_TEMPLATE 0x1045 -#define VALUE_OPT_STDOUT_INFO 0x1046 -#define VALUE_OPT_ASK_PASS 0x1047 -#define VALUE_OPT_PKCS_CIPHER 0x1048 -#define VALUE_OPT_PROVIDER 0x1049 +#define VALUE_OPT_CURVE 0x103F +#define VALUE_OPT_SEC_PARAM 0x1040 +#define VALUE_OPT_DISABLE_QUICK_RANDOM 0x1041 +#define VALUE_OPT_TEMPLATE 0x1042 +#define VALUE_OPT_STDOUT_INFO 0x1043 +#define VALUE_OPT_ASK_PASS 0x1044 +#define VALUE_OPT_PKCS_CIPHER 0x1045 +#define VALUE_OPT_PROVIDER 0x1046 /** option flag (value) for help-value option */ #define VALUE_OPT_HELP 'h' /** option flag (value) for more-help-value option */ diff --git a/src/cli-args.c.bak b/src/cli-args.c.bak index 80b8f77f47..5f81327438 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[4810] = +static char const gnutls_cli_opt_strs[4531] = /* 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" @@ -137,133 +137,118 @@ static char const gnutls_cli_opt_strs[4810] = /* 1973 */ "Use DER format for certificates to read from\0" /* 2018 */ "X509FMTDER\0" /* 2029 */ "x509fmtder\0" -/* 2040 */ "Send the openpgp fingerprint, instead of the key\0" -/* 2089 */ "FINGERPRINT\0" -/* 2101 */ "fingerprint\0" -/* 2113 */ "Print peer's certificate in PEM format\0" -/* 2152 */ "PRINT_CERT\0" -/* 2163 */ "print-cert\0" -/* 2174 */ "Save the peer's certificate chain in the specified file in PEM format\0" -/* 2244 */ "SAVE_CERT\0" -/* 2254 */ "save-cert\0" -/* 2264 */ "Save the peer's OCSP status response in the provided file\0" -/* 2322 */ "SAVE_OCSP\0" -/* 2332 */ "save-ocsp\0" -/* 2342 */ "The minimum number of bits allowed for DH\0" -/* 2384 */ "DH_BITS\0" -/* 2392 */ "dh-bits\0" -/* 2400 */ "Priorities string\0" -/* 2418 */ "PRIORITY\0" -/* 2427 */ "priority\0" -/* 2436 */ "Certificate file or PKCS #11 URL to use\0" -/* 2476 */ "X509CAFILE\0" -/* 2487 */ "x509cafile\0" -/* 2498 */ "CRL file to use\0" -/* 2514 */ "X509CRLFILE\0" -/* 2526 */ "x509crlfile\0" -/* 2538 */ "PGP Key file to use\0" -/* 2558 */ "PGPKEYFILE\0" -/* 2569 */ "pgpkeyfile\0" -/* 2580 */ "PGP Key ring file to use\0" -/* 2605 */ "PGPKEYRING\0" -/* 2616 */ "pgpkeyring\0" -/* 2627 */ "PGP Public Key (certificate) file to use\0" -/* 2668 */ "PGPCERTFILE\0" -/* 2680 */ "pgpcertfile\0" -/* 2692 */ "X.509 key file or PKCS #11 URL to use\0" -/* 2730 */ "X509KEYFILE\0" -/* 2742 */ "x509keyfile\0" -/* 2754 */ "X.509 Certificate file or PKCS #11 URL to use\0" -/* 2800 */ "X509CERTFILE\0" -/* 2813 */ "x509certfile\0" -/* 2826 */ "PGP subkey to use (hex or auto)\0" -/* 2858 */ "PGPSUBKEY\0" -/* 2868 */ "pgpsubkey\0" -/* 2878 */ "SRP username to use\0" -/* 2898 */ "SRPUSERNAME\0" -/* 2910 */ "srpusername\0" -/* 2922 */ "SRP password to use\0" -/* 2942 */ "SRPPASSWD\0" -/* 2952 */ "srppasswd\0" -/* 2962 */ "PSK username to use\0" -/* 2982 */ "PSKUSERNAME\0" -/* 2994 */ "pskusername\0" -/* 3006 */ "PSK key (in hex) to use\0" -/* 3030 */ "PSKKEY\0" -/* 3037 */ "pskkey\0" -/* 3044 */ "The port or service to connect to\0" -/* 3078 */ "PORT\0" -/* 3083 */ "port\0" -/* 3088 */ "Don't abort program if server certificate can't be validated\0" -/* 3149 */ "INSECURE\0" -/* 3158 */ "insecure\0" -/* 3167 */ "Use length-hiding padding to prevent traffic analysis\0" -/* 3221 */ "RANGES\0" -/* 3228 */ "ranges\0" -/* 3235 */ "Benchmark individual ciphers\0" -/* 3264 */ "BENCHMARK_CIPHERS\0" -/* 3282 */ "benchmark-ciphers\0" -/* 3300 */ "Benchmark TLS key exchange methods\0" -/* 3335 */ "BENCHMARK_TLS_KX\0" -/* 3352 */ "benchmark-tls-kx\0" -/* 3369 */ "Benchmark TLS ciphers\0" -/* 3391 */ "BENCHMARK_TLS_CIPHERS\0" -/* 3413 */ "benchmark-tls-ciphers\0" -/* 3435 */ "Print a list of the supported algorithms and modes\0" -/* 3486 */ "LIST\0" -/* 3491 */ "list\0" -/* 3496 */ "Print a list of the supported priority strings\0" -/* 3543 */ "PRIORITY_LIST\0" -/* 3557 */ "priority-list\0" -/* 3571 */ "Don't allow session tickets\0" -/* 3599 */ "NOTICKET\0" -/* 3608 */ "noticket\0" -/* 3617 */ "Offer SRTP profiles\0" -/* 3637 */ "SRTP_PROFILES\0" -/* 3651 */ "srtp-profiles\0" -/* 3665 */ "Application layer protocol\0" -/* 3692 */ "ALPN\0" -/* 3697 */ "alpn\0" -/* 3702 */ "Activate heartbeat support\0" -/* 3729 */ "HEARTBEAT\0" -/* 3739 */ "heartbeat\0" -/* 3749 */ "The maximum record size to advertize\0" -/* 3786 */ "RECORDSIZE\0" -/* 3797 */ "recordsize\0" -/* 3808 */ "Do not send a Server Name Indication (SNI)\0" -/* 3851 */ "DISABLE_SNI\0" -/* 3863 */ "disable-sni\0" -/* 3875 */ "Disable all the TLS extensions\0" -/* 3906 */ "DISABLE_EXTENSIONS\0" -/* 3925 */ "disable-extensions\0" -/* 3944 */ "Inline commands of the form ^<cmd>^\0" -/* 3980 */ "INLINE_COMMANDS\0" -/* 3996 */ "inline-commands\0" -/* 4012 */ "Change the default delimiter for inline commands.\0" -/* 4062 */ "INLINE_COMMANDS_PREFIX\0" -/* 4085 */ "inline-commands-prefix\0" -/* 4108 */ "Specify the PKCS #11 provider library\0" -/* 4146 */ "PROVIDER\0" -/* 4155 */ "provider\0" -/* 4164 */ "Reports the status of the FIPS140-2 mode in gnutls library\0" -/* 4223 */ "FIPS140_MODE\0" -/* 4236 */ "fips140-mode\0" -/* 4249 */ "display extended usage information and exit\0" -/* 4293 */ "help\0" -/* 4298 */ "extended usage information passed thru pager\0" -/* 4343 */ "more-help\0" -/* 4353 */ "output version information and exit\0" -/* 4389 */ "version\0" -/* 4397 */ "GNUTLS_CLI\0" -/* 4408 */ "gnutls-cli - GnuTLS client\n" +/* 2040 */ "Print peer's certificate in PEM format\0" +/* 2079 */ "PRINT_CERT\0" +/* 2090 */ "print-cert\0" +/* 2101 */ "Save the peer's certificate chain in the specified file in PEM format\0" +/* 2171 */ "SAVE_CERT\0" +/* 2181 */ "save-cert\0" +/* 2191 */ "Save the peer's OCSP status response in the provided file\0" +/* 2249 */ "SAVE_OCSP\0" +/* 2259 */ "save-ocsp\0" +/* 2269 */ "The minimum number of bits allowed for DH\0" +/* 2311 */ "DH_BITS\0" +/* 2319 */ "dh-bits\0" +/* 2327 */ "Priorities string\0" +/* 2345 */ "PRIORITY\0" +/* 2354 */ "priority\0" +/* 2363 */ "Certificate file or PKCS #11 URL to use\0" +/* 2403 */ "X509CAFILE\0" +/* 2414 */ "x509cafile\0" +/* 2425 */ "CRL file to use\0" +/* 2441 */ "X509CRLFILE\0" +/* 2453 */ "x509crlfile\0" +/* 2465 */ "X.509 key file or PKCS #11 URL to use\0" +/* 2503 */ "X509KEYFILE\0" +/* 2515 */ "x509keyfile\0" +/* 2527 */ "X.509 Certificate file or PKCS #11 URL to use\0" +/* 2573 */ "X509CERTFILE\0" +/* 2586 */ "x509certfile\0" +/* 2599 */ "SRP username to use\0" +/* 2619 */ "SRPUSERNAME\0" +/* 2631 */ "srpusername\0" +/* 2643 */ "SRP password to use\0" +/* 2663 */ "SRPPASSWD\0" +/* 2673 */ "srppasswd\0" +/* 2683 */ "PSK username to use\0" +/* 2703 */ "PSKUSERNAME\0" +/* 2715 */ "pskusername\0" +/* 2727 */ "PSK key (in hex) to use\0" +/* 2751 */ "PSKKEY\0" +/* 2758 */ "pskkey\0" +/* 2765 */ "The port or service to connect to\0" +/* 2799 */ "PORT\0" +/* 2804 */ "port\0" +/* 2809 */ "Don't abort program if server certificate can't be validated\0" +/* 2870 */ "INSECURE\0" +/* 2879 */ "insecure\0" +/* 2888 */ "Use length-hiding padding to prevent traffic analysis\0" +/* 2942 */ "RANGES\0" +/* 2949 */ "ranges\0" +/* 2956 */ "Benchmark individual ciphers\0" +/* 2985 */ "BENCHMARK_CIPHERS\0" +/* 3003 */ "benchmark-ciphers\0" +/* 3021 */ "Benchmark TLS key exchange methods\0" +/* 3056 */ "BENCHMARK_TLS_KX\0" +/* 3073 */ "benchmark-tls-kx\0" +/* 3090 */ "Benchmark TLS ciphers\0" +/* 3112 */ "BENCHMARK_TLS_CIPHERS\0" +/* 3134 */ "benchmark-tls-ciphers\0" +/* 3156 */ "Print a list of the supported algorithms and modes\0" +/* 3207 */ "LIST\0" +/* 3212 */ "list\0" +/* 3217 */ "Print a list of the supported priority strings\0" +/* 3264 */ "PRIORITY_LIST\0" +/* 3278 */ "priority-list\0" +/* 3292 */ "Don't allow session tickets\0" +/* 3320 */ "NOTICKET\0" +/* 3329 */ "noticket\0" +/* 3338 */ "Offer SRTP profiles\0" +/* 3358 */ "SRTP_PROFILES\0" +/* 3372 */ "srtp-profiles\0" +/* 3386 */ "Application layer protocol\0" +/* 3413 */ "ALPN\0" +/* 3418 */ "alpn\0" +/* 3423 */ "Activate heartbeat support\0" +/* 3450 */ "HEARTBEAT\0" +/* 3460 */ "heartbeat\0" +/* 3470 */ "The maximum record size to advertize\0" +/* 3507 */ "RECORDSIZE\0" +/* 3518 */ "recordsize\0" +/* 3529 */ "Do not send a Server Name Indication (SNI)\0" +/* 3572 */ "DISABLE_SNI\0" +/* 3584 */ "disable-sni\0" +/* 3596 */ "Disable all the TLS extensions\0" +/* 3627 */ "DISABLE_EXTENSIONS\0" +/* 3646 */ "disable-extensions\0" +/* 3665 */ "Inline commands of the form ^<cmd>^\0" +/* 3701 */ "INLINE_COMMANDS\0" +/* 3717 */ "inline-commands\0" +/* 3733 */ "Change the default delimiter for inline commands.\0" +/* 3783 */ "INLINE_COMMANDS_PREFIX\0" +/* 3806 */ "inline-commands-prefix\0" +/* 3829 */ "Specify the PKCS #11 provider library\0" +/* 3867 */ "PROVIDER\0" +/* 3876 */ "provider\0" +/* 3885 */ "Reports the status of the FIPS140-2 mode in gnutls library\0" +/* 3944 */ "FIPS140_MODE\0" +/* 3957 */ "fips140-mode\0" +/* 3970 */ "display extended usage information and exit\0" +/* 4014 */ "help\0" +/* 4019 */ "extended usage information passed thru pager\0" +/* 4064 */ "more-help\0" +/* 4074 */ "output version information and exit\0" +/* 4110 */ "version\0" +/* 4118 */ "GNUTLS_CLI\0" +/* 4129 */ "gnutls-cli - GnuTLS client\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostname]\n\0" -/* 4504 */ "@PACKAGE_BUGREPORT@\0" -/* 4524 */ "\n\0" -/* 4526 */ "Simple client program to set up a TLS connection to some other computer. It\n" +/* 4225 */ "@PACKAGE_BUGREPORT@\0" +/* 4245 */ "\n\0" +/* 4247 */ "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" -/* 4709 */ "gnutls-cli @VERSION@\0" -/* 4730 */ "Usage: gnutls-cli [options] hostname\n" +/* 4430 */ "gnutls-cli @VERSION@\0" +/* 4451 */ "Usage: gnutls-cli [options] hostname\n" "gnutls-cli --help for usage instructions.\n"; /** @@ -526,26 +511,14 @@ static int const aStarttls_ProtoCantList[] = { #define X509FMTDER_FLAGS (OPTST_DISABLED) /** - * fingerprint option description: - */ -/** Descriptive text for the fingerprint option */ -#define FINGERPRINT_DESC (gnutls_cli_opt_strs+2040) -/** Upper-cased name for the fingerprint option */ -#define FINGERPRINT_NAME (gnutls_cli_opt_strs+2089) -/** Name string for the fingerprint option */ -#define FINGERPRINT_name (gnutls_cli_opt_strs+2101) -/** Compiled in flag settings for the fingerprint option */ -#define FINGERPRINT_FLAGS (OPTST_DISABLED) - -/** * print-cert option description: */ /** Descriptive text for the print-cert option */ -#define PRINT_CERT_DESC (gnutls_cli_opt_strs+2113) +#define PRINT_CERT_DESC (gnutls_cli_opt_strs+2040) /** Upper-cased name for the print-cert option */ -#define PRINT_CERT_NAME (gnutls_cli_opt_strs+2152) +#define PRINT_CERT_NAME (gnutls_cli_opt_strs+2079) /** Name string for the print-cert option */ -#define PRINT_CERT_name (gnutls_cli_opt_strs+2163) +#define PRINT_CERT_name (gnutls_cli_opt_strs+2090) /** Compiled in flag settings for the print-cert option */ #define PRINT_CERT_FLAGS (OPTST_DISABLED) @@ -553,11 +526,11 @@ static int const aStarttls_ProtoCantList[] = { * save-cert option description: */ /** Descriptive text for the save-cert option */ -#define SAVE_CERT_DESC (gnutls_cli_opt_strs+2174) +#define SAVE_CERT_DESC (gnutls_cli_opt_strs+2101) /** Upper-cased name for the save-cert option */ -#define SAVE_CERT_NAME (gnutls_cli_opt_strs+2244) +#define SAVE_CERT_NAME (gnutls_cli_opt_strs+2171) /** Name string for the save-cert option */ -#define SAVE_CERT_name (gnutls_cli_opt_strs+2254) +#define SAVE_CERT_name (gnutls_cli_opt_strs+2181) /** Compiled in flag settings for the save-cert option */ #define SAVE_CERT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -566,11 +539,11 @@ static int const aStarttls_ProtoCantList[] = { * save-ocsp option description: */ /** Descriptive text for the save-ocsp option */ -#define SAVE_OCSP_DESC (gnutls_cli_opt_strs+2264) +#define SAVE_OCSP_DESC (gnutls_cli_opt_strs+2191) /** Upper-cased name for the save-ocsp option */ -#define SAVE_OCSP_NAME (gnutls_cli_opt_strs+2322) +#define SAVE_OCSP_NAME (gnutls_cli_opt_strs+2249) /** Name string for the save-ocsp option */ -#define SAVE_OCSP_name (gnutls_cli_opt_strs+2332) +#define SAVE_OCSP_name (gnutls_cli_opt_strs+2259) /** Compiled in flag settings for the save-ocsp option */ #define SAVE_OCSP_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -579,11 +552,11 @@ static int const aStarttls_ProtoCantList[] = { * dh-bits option description: */ /** Descriptive text for the dh-bits option */ -#define DH_BITS_DESC (gnutls_cli_opt_strs+2342) +#define DH_BITS_DESC (gnutls_cli_opt_strs+2269) /** Upper-cased name for the dh-bits option */ -#define DH_BITS_NAME (gnutls_cli_opt_strs+2384) +#define DH_BITS_NAME (gnutls_cli_opt_strs+2311) /** Name string for the dh-bits option */ -#define DH_BITS_name (gnutls_cli_opt_strs+2392) +#define DH_BITS_name (gnutls_cli_opt_strs+2319) /** Compiled in flag settings for the dh-bits option */ #define DH_BITS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -592,11 +565,11 @@ static int const aStarttls_ProtoCantList[] = { * priority option description: */ /** Descriptive text for the priority option */ -#define PRIORITY_DESC (gnutls_cli_opt_strs+2400) +#define PRIORITY_DESC (gnutls_cli_opt_strs+2327) /** Upper-cased name for the priority option */ -#define PRIORITY_NAME (gnutls_cli_opt_strs+2418) +#define PRIORITY_NAME (gnutls_cli_opt_strs+2345) /** Name string for the priority option */ -#define PRIORITY_name (gnutls_cli_opt_strs+2427) +#define PRIORITY_name (gnutls_cli_opt_strs+2354) /** Compiled in flag settings for the priority option */ #define PRIORITY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -605,11 +578,11 @@ static int const aStarttls_ProtoCantList[] = { * x509cafile option description: */ /** Descriptive text for the x509cafile option */ -#define X509CAFILE_DESC (gnutls_cli_opt_strs+2436) +#define X509CAFILE_DESC (gnutls_cli_opt_strs+2363) /** Upper-cased name for the x509cafile option */ -#define X509CAFILE_NAME (gnutls_cli_opt_strs+2476) +#define X509CAFILE_NAME (gnutls_cli_opt_strs+2403) /** Name string for the x509cafile option */ -#define X509CAFILE_name (gnutls_cli_opt_strs+2487) +#define X509CAFILE_name (gnutls_cli_opt_strs+2414) /** Compiled in flag settings for the x509cafile option */ #define X509CAFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -618,67 +591,24 @@ static int const aStarttls_ProtoCantList[] = { * x509crlfile option description: */ /** Descriptive text for the x509crlfile option */ -#define X509CRLFILE_DESC (gnutls_cli_opt_strs+2498) +#define X509CRLFILE_DESC (gnutls_cli_opt_strs+2425) /** Upper-cased name for the x509crlfile option */ -#define X509CRLFILE_NAME (gnutls_cli_opt_strs+2514) +#define X509CRLFILE_NAME (gnutls_cli_opt_strs+2441) /** Name string for the x509crlfile option */ -#define X509CRLFILE_name (gnutls_cli_opt_strs+2526) +#define X509CRLFILE_name (gnutls_cli_opt_strs+2453) /** Compiled in flag settings for the x509crlfile option */ #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+2538) -/** Upper-cased name for the pgpkeyfile option */ -#define PGPKEYFILE_NAME (gnutls_cli_opt_strs+2558) -/** Name string for the pgpkeyfile option */ -#define PGPKEYFILE_name (gnutls_cli_opt_strs+2569) -/** Compiled in flag settings for the pgpkeyfile option */ -#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+2580) -/** Upper-cased name for the pgpkeyring option */ -#define PGPKEYRING_NAME (gnutls_cli_opt_strs+2605) -/** Name string for the pgpkeyring option */ -#define PGPKEYRING_name (gnutls_cli_opt_strs+2616) -/** Compiled in flag settings for the pgpkeyring option */ -#define PGPKEYRING_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) - -/** - * pgpcertfile option description with - * "Must also have options" and "Incompatible options": - */ -/** Descriptive text for the pgpcertfile option */ -#define PGPCERTFILE_DESC (gnutls_cli_opt_strs+2627) -/** Upper-cased name for the pgpcertfile option */ -#define PGPCERTFILE_NAME (gnutls_cli_opt_strs+2668) -/** Name string for the pgpcertfile option */ -#define PGPCERTFILE_name (gnutls_cli_opt_strs+2680) -/** Other options that are required by the pgpcertfile option */ -static int const aPgpcertfileMustList[] = { - INDEX_OPT_PGPKEYFILE, NO_EQUIVALENT }; -/** Compiled in flag settings for the pgpcertfile option */ -#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+2692) +#define X509KEYFILE_DESC (gnutls_cli_opt_strs+2465) /** Upper-cased name for the x509keyfile option */ -#define X509KEYFILE_NAME (gnutls_cli_opt_strs+2730) +#define X509KEYFILE_NAME (gnutls_cli_opt_strs+2503) /** Name string for the x509keyfile option */ -#define X509KEYFILE_name (gnutls_cli_opt_strs+2742) +#define X509KEYFILE_name (gnutls_cli_opt_strs+2515) /** Compiled in flag settings for the x509keyfile option */ #define X509KEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -688,11 +618,11 @@ static int const aPgpcertfileMustList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the x509certfile option */ -#define X509CERTFILE_DESC (gnutls_cli_opt_strs+2754) +#define X509CERTFILE_DESC (gnutls_cli_opt_strs+2527) /** Upper-cased name for the x509certfile option */ -#define X509CERTFILE_NAME (gnutls_cli_opt_strs+2800) +#define X509CERTFILE_NAME (gnutls_cli_opt_strs+2573) /** Name string for the x509certfile option */ -#define X509CERTFILE_name (gnutls_cli_opt_strs+2813) +#define X509CERTFILE_name (gnutls_cli_opt_strs+2586) /** Other options that are required by the x509certfile option */ static int const aX509certfileMustList[] = { INDEX_OPT_X509KEYFILE, NO_EQUIVALENT }; @@ -701,27 +631,14 @@ static int const aX509certfileMustList[] = { | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /** - * pgpsubkey option description: - */ -/** Descriptive text for the pgpsubkey option */ -#define PGPSUBKEY_DESC (gnutls_cli_opt_strs+2826) -/** Upper-cased name for the pgpsubkey option */ -#define PGPSUBKEY_NAME (gnutls_cli_opt_strs+2858) -/** Name string for the pgpsubkey option */ -#define PGPSUBKEY_name (gnutls_cli_opt_strs+2868) -/** Compiled in flag settings for the pgpsubkey option */ -#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+2878) +#define SRPUSERNAME_DESC (gnutls_cli_opt_strs+2599) /** Upper-cased name for the srpusername option */ -#define SRPUSERNAME_NAME (gnutls_cli_opt_strs+2898) +#define SRPUSERNAME_NAME (gnutls_cli_opt_strs+2619) /** Name string for the srpusername option */ -#define SRPUSERNAME_name (gnutls_cli_opt_strs+2910) +#define SRPUSERNAME_name (gnutls_cli_opt_strs+2631) /** Compiled in flag settings for the srpusername option */ #define SRPUSERNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -730,11 +647,11 @@ static int const aX509certfileMustList[] = { * srppasswd option description: */ /** Descriptive text for the srppasswd option */ -#define SRPPASSWD_DESC (gnutls_cli_opt_strs+2922) +#define SRPPASSWD_DESC (gnutls_cli_opt_strs+2643) /** Upper-cased name for the srppasswd option */ -#define SRPPASSWD_NAME (gnutls_cli_opt_strs+2942) +#define SRPPASSWD_NAME (gnutls_cli_opt_strs+2663) /** Name string for the srppasswd option */ -#define SRPPASSWD_name (gnutls_cli_opt_strs+2952) +#define SRPPASSWD_name (gnutls_cli_opt_strs+2673) /** Compiled in flag settings for the srppasswd option */ #define SRPPASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -743,11 +660,11 @@ static int const aX509certfileMustList[] = { * pskusername option description: */ /** Descriptive text for the pskusername option */ -#define PSKUSERNAME_DESC (gnutls_cli_opt_strs+2962) +#define PSKUSERNAME_DESC (gnutls_cli_opt_strs+2683) /** Upper-cased name for the pskusername option */ -#define PSKUSERNAME_NAME (gnutls_cli_opt_strs+2982) +#define PSKUSERNAME_NAME (gnutls_cli_opt_strs+2703) /** Name string for the pskusername option */ -#define PSKUSERNAME_name (gnutls_cli_opt_strs+2994) +#define PSKUSERNAME_name (gnutls_cli_opt_strs+2715) /** Compiled in flag settings for the pskusername option */ #define PSKUSERNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -756,11 +673,11 @@ static int const aX509certfileMustList[] = { * pskkey option description: */ /** Descriptive text for the pskkey option */ -#define PSKKEY_DESC (gnutls_cli_opt_strs+3006) +#define PSKKEY_DESC (gnutls_cli_opt_strs+2727) /** Upper-cased name for the pskkey option */ -#define PSKKEY_NAME (gnutls_cli_opt_strs+3030) +#define PSKKEY_NAME (gnutls_cli_opt_strs+2751) /** Name string for the pskkey option */ -#define PSKKEY_name (gnutls_cli_opt_strs+3037) +#define PSKKEY_name (gnutls_cli_opt_strs+2758) /** Compiled in flag settings for the pskkey option */ #define PSKKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -769,11 +686,11 @@ static int const aX509certfileMustList[] = { * port option description: */ /** Descriptive text for the port option */ -#define PORT_DESC (gnutls_cli_opt_strs+3044) +#define PORT_DESC (gnutls_cli_opt_strs+2765) /** Upper-cased name for the port option */ -#define PORT_NAME (gnutls_cli_opt_strs+3078) +#define PORT_NAME (gnutls_cli_opt_strs+2799) /** Name string for the port option */ -#define PORT_name (gnutls_cli_opt_strs+3083) +#define PORT_name (gnutls_cli_opt_strs+2804) /** Compiled in flag settings for the port option */ #define PORT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -782,11 +699,11 @@ static int const aX509certfileMustList[] = { * insecure option description: */ /** Descriptive text for the insecure option */ -#define INSECURE_DESC (gnutls_cli_opt_strs+3088) +#define INSECURE_DESC (gnutls_cli_opt_strs+2809) /** Upper-cased name for the insecure option */ -#define INSECURE_NAME (gnutls_cli_opt_strs+3149) +#define INSECURE_NAME (gnutls_cli_opt_strs+2870) /** Name string for the insecure option */ -#define INSECURE_name (gnutls_cli_opt_strs+3158) +#define INSECURE_name (gnutls_cli_opt_strs+2879) /** Compiled in flag settings for the insecure option */ #define INSECURE_FLAGS (OPTST_DISABLED) @@ -794,11 +711,11 @@ static int const aX509certfileMustList[] = { * ranges option description: */ /** Descriptive text for the ranges option */ -#define RANGES_DESC (gnutls_cli_opt_strs+3167) +#define RANGES_DESC (gnutls_cli_opt_strs+2888) /** Upper-cased name for the ranges option */ -#define RANGES_NAME (gnutls_cli_opt_strs+3221) +#define RANGES_NAME (gnutls_cli_opt_strs+2942) /** Name string for the ranges option */ -#define RANGES_name (gnutls_cli_opt_strs+3228) +#define RANGES_name (gnutls_cli_opt_strs+2949) /** Compiled in flag settings for the ranges option */ #define RANGES_FLAGS (OPTST_DISABLED) @@ -806,11 +723,11 @@ static int const aX509certfileMustList[] = { * benchmark-ciphers option description: */ /** Descriptive text for the benchmark-ciphers option */ -#define BENCHMARK_CIPHERS_DESC (gnutls_cli_opt_strs+3235) +#define BENCHMARK_CIPHERS_DESC (gnutls_cli_opt_strs+2956) /** Upper-cased name for the benchmark-ciphers option */ -#define BENCHMARK_CIPHERS_NAME (gnutls_cli_opt_strs+3264) +#define BENCHMARK_CIPHERS_NAME (gnutls_cli_opt_strs+2985) /** Name string for the benchmark-ciphers option */ -#define BENCHMARK_CIPHERS_name (gnutls_cli_opt_strs+3282) +#define BENCHMARK_CIPHERS_name (gnutls_cli_opt_strs+3003) /** Compiled in flag settings for the benchmark-ciphers option */ #define BENCHMARK_CIPHERS_FLAGS (OPTST_DISABLED) @@ -818,11 +735,11 @@ static int const aX509certfileMustList[] = { * benchmark-tls-kx option description: */ /** Descriptive text for the benchmark-tls-kx option */ -#define BENCHMARK_TLS_KX_DESC (gnutls_cli_opt_strs+3300) +#define BENCHMARK_TLS_KX_DESC (gnutls_cli_opt_strs+3021) /** Upper-cased name for the benchmark-tls-kx option */ -#define BENCHMARK_TLS_KX_NAME (gnutls_cli_opt_strs+3335) +#define BENCHMARK_TLS_KX_NAME (gnutls_cli_opt_strs+3056) /** Name string for the benchmark-tls-kx option */ -#define BENCHMARK_TLS_KX_name (gnutls_cli_opt_strs+3352) +#define BENCHMARK_TLS_KX_name (gnutls_cli_opt_strs+3073) /** Compiled in flag settings for the benchmark-tls-kx option */ #define BENCHMARK_TLS_KX_FLAGS (OPTST_DISABLED) @@ -830,11 +747,11 @@ static int const aX509certfileMustList[] = { * benchmark-tls-ciphers option description: */ /** Descriptive text for the benchmark-tls-ciphers option */ -#define BENCHMARK_TLS_CIPHERS_DESC (gnutls_cli_opt_strs+3369) +#define BENCHMARK_TLS_CIPHERS_DESC (gnutls_cli_opt_strs+3090) /** Upper-cased name for the benchmark-tls-ciphers option */ -#define BENCHMARK_TLS_CIPHERS_NAME (gnutls_cli_opt_strs+3391) +#define BENCHMARK_TLS_CIPHERS_NAME (gnutls_cli_opt_strs+3112) /** Name string for the benchmark-tls-ciphers option */ -#define BENCHMARK_TLS_CIPHERS_name (gnutls_cli_opt_strs+3413) +#define BENCHMARK_TLS_CIPHERS_name (gnutls_cli_opt_strs+3134) /** Compiled in flag settings for the benchmark-tls-ciphers option */ #define BENCHMARK_TLS_CIPHERS_FLAGS (OPTST_DISABLED) @@ -843,11 +760,11 @@ static int const aX509certfileMustList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the list option */ -#define LIST_DESC (gnutls_cli_opt_strs+3435) +#define LIST_DESC (gnutls_cli_opt_strs+3156) /** Upper-cased name for the list option */ -#define LIST_NAME (gnutls_cli_opt_strs+3486) +#define LIST_NAME (gnutls_cli_opt_strs+3207) /** Name string for the list option */ -#define LIST_name (gnutls_cli_opt_strs+3491) +#define LIST_name (gnutls_cli_opt_strs+3212) /** Other options that appear in conjunction with the list option */ static int const aListCantList[] = { INDEX_OPT_PORT, NO_EQUIVALENT }; @@ -858,11 +775,11 @@ static int const aListCantList[] = { * priority-list option description: */ /** Descriptive text for the priority-list option */ -#define PRIORITY_LIST_DESC (gnutls_cli_opt_strs+3496) +#define PRIORITY_LIST_DESC (gnutls_cli_opt_strs+3217) /** Upper-cased name for the priority-list option */ -#define PRIORITY_LIST_NAME (gnutls_cli_opt_strs+3543) +#define PRIORITY_LIST_NAME (gnutls_cli_opt_strs+3264) /** Name string for the priority-list option */ -#define PRIORITY_LIST_name (gnutls_cli_opt_strs+3557) +#define PRIORITY_LIST_name (gnutls_cli_opt_strs+3278) /** Compiled in flag settings for the priority-list option */ #define PRIORITY_LIST_FLAGS (OPTST_DISABLED) @@ -870,11 +787,11 @@ static int const aListCantList[] = { * noticket option description: */ /** Descriptive text for the noticket option */ -#define NOTICKET_DESC (gnutls_cli_opt_strs+3571) +#define NOTICKET_DESC (gnutls_cli_opt_strs+3292) /** Upper-cased name for the noticket option */ -#define NOTICKET_NAME (gnutls_cli_opt_strs+3599) +#define NOTICKET_NAME (gnutls_cli_opt_strs+3320) /** Name string for the noticket option */ -#define NOTICKET_name (gnutls_cli_opt_strs+3608) +#define NOTICKET_name (gnutls_cli_opt_strs+3329) /** Compiled in flag settings for the noticket option */ #define NOTICKET_FLAGS (OPTST_DISABLED) @@ -882,11 +799,11 @@ static int const aListCantList[] = { * srtp_profiles option description: */ /** Descriptive text for the srtp_profiles option */ -#define SRTP_PROFILES_DESC (gnutls_cli_opt_strs+3617) +#define SRTP_PROFILES_DESC (gnutls_cli_opt_strs+3338) /** Upper-cased name for the srtp_profiles option */ -#define SRTP_PROFILES_NAME (gnutls_cli_opt_strs+3637) +#define SRTP_PROFILES_NAME (gnutls_cli_opt_strs+3358) /** Name string for the srtp_profiles option */ -#define SRTP_PROFILES_name (gnutls_cli_opt_strs+3651) +#define SRTP_PROFILES_name (gnutls_cli_opt_strs+3372) /** Compiled in flag settings for the srtp_profiles option */ #define SRTP_PROFILES_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -895,11 +812,11 @@ static int const aListCantList[] = { * alpn option description: */ /** Descriptive text for the alpn option */ -#define ALPN_DESC (gnutls_cli_opt_strs+3665) +#define ALPN_DESC (gnutls_cli_opt_strs+3386) /** Upper-cased name for the alpn option */ -#define ALPN_NAME (gnutls_cli_opt_strs+3692) +#define ALPN_NAME (gnutls_cli_opt_strs+3413) /** Name string for the alpn option */ -#define ALPN_name (gnutls_cli_opt_strs+3697) +#define ALPN_name (gnutls_cli_opt_strs+3418) /** Compiled in flag settings for the alpn option */ #define ALPN_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -908,11 +825,11 @@ static int const aListCantList[] = { * heartbeat option description: */ /** Descriptive text for the heartbeat option */ -#define HEARTBEAT_DESC (gnutls_cli_opt_strs+3702) +#define HEARTBEAT_DESC (gnutls_cli_opt_strs+3423) /** Upper-cased name for the heartbeat option */ -#define HEARTBEAT_NAME (gnutls_cli_opt_strs+3729) +#define HEARTBEAT_NAME (gnutls_cli_opt_strs+3450) /** Name string for the heartbeat option */ -#define HEARTBEAT_name (gnutls_cli_opt_strs+3739) +#define HEARTBEAT_name (gnutls_cli_opt_strs+3460) /** Compiled in flag settings for the heartbeat option */ #define HEARTBEAT_FLAGS (OPTST_DISABLED) @@ -920,11 +837,11 @@ static int const aListCantList[] = { * recordsize option description: */ /** Descriptive text for the recordsize option */ -#define RECORDSIZE_DESC (gnutls_cli_opt_strs+3749) +#define RECORDSIZE_DESC (gnutls_cli_opt_strs+3470) /** Upper-cased name for the recordsize option */ -#define RECORDSIZE_NAME (gnutls_cli_opt_strs+3786) +#define RECORDSIZE_NAME (gnutls_cli_opt_strs+3507) /** Name string for the recordsize option */ -#define RECORDSIZE_name (gnutls_cli_opt_strs+3797) +#define RECORDSIZE_name (gnutls_cli_opt_strs+3518) /** Compiled in flag settings for the recordsize option */ #define RECORDSIZE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -933,11 +850,11 @@ static int const aListCantList[] = { * disable-sni option description: */ /** Descriptive text for the disable-sni option */ -#define DISABLE_SNI_DESC (gnutls_cli_opt_strs+3808) +#define DISABLE_SNI_DESC (gnutls_cli_opt_strs+3529) /** Upper-cased name for the disable-sni option */ -#define DISABLE_SNI_NAME (gnutls_cli_opt_strs+3851) +#define DISABLE_SNI_NAME (gnutls_cli_opt_strs+3572) /** Name string for the disable-sni option */ -#define DISABLE_SNI_name (gnutls_cli_opt_strs+3863) +#define DISABLE_SNI_name (gnutls_cli_opt_strs+3584) /** Compiled in flag settings for the disable-sni option */ #define DISABLE_SNI_FLAGS (OPTST_DISABLED) @@ -945,11 +862,11 @@ static int const aListCantList[] = { * disable-extensions option description: */ /** Descriptive text for the disable-extensions option */ -#define DISABLE_EXTENSIONS_DESC (gnutls_cli_opt_strs+3875) +#define DISABLE_EXTENSIONS_DESC (gnutls_cli_opt_strs+3596) /** Upper-cased name for the disable-extensions option */ -#define DISABLE_EXTENSIONS_NAME (gnutls_cli_opt_strs+3906) +#define DISABLE_EXTENSIONS_NAME (gnutls_cli_opt_strs+3627) /** Name string for the disable-extensions option */ -#define DISABLE_EXTENSIONS_name (gnutls_cli_opt_strs+3925) +#define DISABLE_EXTENSIONS_name (gnutls_cli_opt_strs+3646) /** Compiled in flag settings for the disable-extensions option */ #define DISABLE_EXTENSIONS_FLAGS (OPTST_DISABLED) @@ -957,11 +874,11 @@ static int const aListCantList[] = { * inline-commands option description: */ /** Descriptive text for the inline-commands option */ -#define INLINE_COMMANDS_DESC (gnutls_cli_opt_strs+3944) +#define INLINE_COMMANDS_DESC (gnutls_cli_opt_strs+3665) /** Upper-cased name for the inline-commands option */ -#define INLINE_COMMANDS_NAME (gnutls_cli_opt_strs+3980) +#define INLINE_COMMANDS_NAME (gnutls_cli_opt_strs+3701) /** Name string for the inline-commands option */ -#define INLINE_COMMANDS_name (gnutls_cli_opt_strs+3996) +#define INLINE_COMMANDS_name (gnutls_cli_opt_strs+3717) /** Compiled in flag settings for the inline-commands option */ #define INLINE_COMMANDS_FLAGS (OPTST_DISABLED) @@ -969,11 +886,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+4012) +#define INLINE_COMMANDS_PREFIX_DESC (gnutls_cli_opt_strs+3733) /** Upper-cased name for the inline-commands-prefix option */ -#define INLINE_COMMANDS_PREFIX_NAME (gnutls_cli_opt_strs+4062) +#define INLINE_COMMANDS_PREFIX_NAME (gnutls_cli_opt_strs+3783) /** Name string for the inline-commands-prefix option */ -#define INLINE_COMMANDS_PREFIX_name (gnutls_cli_opt_strs+4085) +#define INLINE_COMMANDS_PREFIX_name (gnutls_cli_opt_strs+3806) /** Compiled in flag settings for the inline-commands-prefix option */ #define INLINE_COMMANDS_PREFIX_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -982,11 +899,11 @@ static int const aListCantList[] = { * provider option description: */ /** Descriptive text for the provider option */ -#define PROVIDER_DESC (gnutls_cli_opt_strs+4108) +#define PROVIDER_DESC (gnutls_cli_opt_strs+3829) /** Upper-cased name for the provider option */ -#define PROVIDER_NAME (gnutls_cli_opt_strs+4146) +#define PROVIDER_NAME (gnutls_cli_opt_strs+3867) /** Name string for the provider option */ -#define PROVIDER_name (gnutls_cli_opt_strs+4155) +#define PROVIDER_name (gnutls_cli_opt_strs+3876) /** Compiled in flag settings for the provider option */ #define PROVIDER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -995,22 +912,22 @@ static int const aListCantList[] = { * fips140-mode option description: */ /** Descriptive text for the fips140-mode option */ -#define FIPS140_MODE_DESC (gnutls_cli_opt_strs+4164) +#define FIPS140_MODE_DESC (gnutls_cli_opt_strs+3885) /** Upper-cased name for the fips140-mode option */ -#define FIPS140_MODE_NAME (gnutls_cli_opt_strs+4223) +#define FIPS140_MODE_NAME (gnutls_cli_opt_strs+3944) /** Name string for the fips140-mode option */ -#define FIPS140_MODE_name (gnutls_cli_opt_strs+4236) +#define FIPS140_MODE_name (gnutls_cli_opt_strs+3957) /** 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+4249) -#define HELP_name (gnutls_cli_opt_strs+4293) +#define HELP_DESC (gnutls_cli_opt_strs+3970) +#define HELP_name (gnutls_cli_opt_strs+4014) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (gnutls_cli_opt_strs+4298) -#define MORE_HELP_name (gnutls_cli_opt_strs+4343) +#define MORE_HELP_DESC (gnutls_cli_opt_strs+4019) +#define MORE_HELP_name (gnutls_cli_opt_strs+4064) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -1023,8 +940,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+4353) -#define VER_name (gnutls_cli_opt_strs+4389) +#define VER_DESC (gnutls_cli_opt_strs+4074) +#define VER_name (gnutls_cli_opt_strs+4110) /** * Declare option callback procedures */ @@ -1034,9 +951,8 @@ extern tOptProc optionStackArg, optionTimeDate, optionTimeVal, optionUnstackArg, optionVendorOption; static tOptProc - doOptApp_Proto, doOptDebug, doOptMtu, doOptPgpcertfile, - doOptPgpkeyfile, doOptPgpkeyring, doOptProvider, doOptRecordsize, - doOptX509crlfile, doUsageOpt; + doOptApp_Proto, doOptDebug, doOptMtu, doOptProvider, + doOptRecordsize, doOptX509crlfile, doUsageOpt; #define VER_PROC optionPrintVersion /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -1274,20 +1190,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509FMTDER_DESC, X509FMTDER_NAME, X509FMTDER_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 19, VALUE_OPT_FINGERPRINT, - /* equiv idx, value */ 19, VALUE_OPT_FINGERPRINT, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ FINGERPRINT_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --fingerprint */ - /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, - /* option proc */ NULL, - /* desc, NAME, name */ FINGERPRINT_DESC, FINGERPRINT_NAME, FINGERPRINT_name, - /* disablement strs */ NULL, NULL }, - - { /* entry idx, value */ 20, VALUE_OPT_PRINT_CERT, - /* equiv idx, value */ 20, VALUE_OPT_PRINT_CERT, + { /* entry idx, value */ 19, VALUE_OPT_PRINT_CERT, + /* equiv idx, value */ 19, VALUE_OPT_PRINT_CERT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PRINT_CERT_FLAGS, 0, @@ -1298,8 +1202,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PRINT_CERT_DESC, PRINT_CERT_NAME, PRINT_CERT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 21, VALUE_OPT_SAVE_CERT, - /* equiv idx, value */ 21, VALUE_OPT_SAVE_CERT, + { /* entry idx, value */ 20, VALUE_OPT_SAVE_CERT, + /* equiv idx, value */ 20, VALUE_OPT_SAVE_CERT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SAVE_CERT_FLAGS, 0, @@ -1310,8 +1214,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SAVE_CERT_DESC, SAVE_CERT_NAME, SAVE_CERT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 22, VALUE_OPT_SAVE_OCSP, - /* equiv idx, value */ 22, VALUE_OPT_SAVE_OCSP, + { /* entry idx, value */ 21, VALUE_OPT_SAVE_OCSP, + /* equiv idx, value */ 21, VALUE_OPT_SAVE_OCSP, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SAVE_OCSP_FLAGS, 0, @@ -1322,8 +1226,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SAVE_OCSP_DESC, SAVE_OCSP_NAME, SAVE_OCSP_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 23, VALUE_OPT_DH_BITS, - /* equiv idx, value */ 23, VALUE_OPT_DH_BITS, + { /* entry idx, value */ 22, VALUE_OPT_DH_BITS, + /* equiv idx, value */ 22, VALUE_OPT_DH_BITS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ DH_BITS_FLAGS, 0, @@ -1334,8 +1238,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ DH_BITS_DESC, DH_BITS_NAME, DH_BITS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 24, VALUE_OPT_PRIORITY, - /* equiv idx, value */ 24, VALUE_OPT_PRIORITY, + { /* entry idx, value */ 23, VALUE_OPT_PRIORITY, + /* equiv idx, value */ 23, VALUE_OPT_PRIORITY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PRIORITY_FLAGS, 0, @@ -1346,8 +1250,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PRIORITY_DESC, PRIORITY_NAME, PRIORITY_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 25, VALUE_OPT_X509CAFILE, - /* equiv idx, value */ 25, VALUE_OPT_X509CAFILE, + { /* entry idx, value */ 24, VALUE_OPT_X509CAFILE, + /* equiv idx, value */ 24, VALUE_OPT_X509CAFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509CAFILE_FLAGS, 0, @@ -1358,8 +1262,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509CAFILE_DESC, X509CAFILE_NAME, X509CAFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 26, VALUE_OPT_X509CRLFILE, - /* equiv idx, value */ 26, VALUE_OPT_X509CRLFILE, + { /* entry idx, value */ 25, VALUE_OPT_X509CRLFILE, + /* equiv idx, value */ 25, VALUE_OPT_X509CRLFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509CRLFILE_FLAGS, 0, @@ -1370,44 +1274,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509CRLFILE_DESC, X509CRLFILE_NAME, X509CRLFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 27, VALUE_OPT_PGPKEYFILE, - /* equiv idx, value */ 27, VALUE_OPT_PGPKEYFILE, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PGPKEYFILE_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --pgpkeyfile */ - /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, - /* option proc */ doOptPgpkeyfile, - /* desc, NAME, name */ PGPKEYFILE_DESC, PGPKEYFILE_NAME, PGPKEYFILE_name, - /* disablement strs */ NULL, NULL }, - - { /* entry idx, value */ 28, VALUE_OPT_PGPKEYRING, - /* equiv idx, value */ 28, VALUE_OPT_PGPKEYRING, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PGPKEYRING_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --pgpkeyring */ - /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, - /* option proc */ doOptPgpkeyring, - /* desc, NAME, name */ PGPKEYRING_DESC, PGPKEYRING_NAME, PGPKEYRING_name, - /* disablement strs */ NULL, NULL }, - - { /* entry idx, value */ 29, VALUE_OPT_PGPCERTFILE, - /* equiv idx, value */ 29, VALUE_OPT_PGPCERTFILE, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PGPCERTFILE_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --pgpcertfile */ - /* arg list/cookie */ NULL, - /* must/cannot opts */ aPgpcertfileMustList, NULL, - /* option proc */ doOptPgpcertfile, - /* desc, NAME, name */ PGPCERTFILE_DESC, PGPCERTFILE_NAME, PGPCERTFILE_name, - /* disablement strs */ NULL, NULL }, - - { /* entry idx, value */ 30, VALUE_OPT_X509KEYFILE, - /* equiv idx, value */ 30, VALUE_OPT_X509KEYFILE, + { /* entry idx, value */ 26, VALUE_OPT_X509KEYFILE, + /* equiv idx, value */ 26, VALUE_OPT_X509KEYFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509KEYFILE_FLAGS, 0, @@ -1418,8 +1286,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509KEYFILE_DESC, X509KEYFILE_NAME, X509KEYFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 31, VALUE_OPT_X509CERTFILE, - /* equiv idx, value */ 31, VALUE_OPT_X509CERTFILE, + { /* entry idx, value */ 27, VALUE_OPT_X509CERTFILE, + /* equiv idx, value */ 27, VALUE_OPT_X509CERTFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509CERTFILE_FLAGS, 0, @@ -1430,20 +1298,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509CERTFILE_DESC, X509CERTFILE_NAME, X509CERTFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 32, VALUE_OPT_PGPSUBKEY, - /* equiv idx, value */ 32, VALUE_OPT_PGPSUBKEY, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PGPSUBKEY_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --pgpsubkey */ - /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, - /* option proc */ NULL, - /* desc, NAME, name */ PGPSUBKEY_DESC, PGPSUBKEY_NAME, PGPSUBKEY_name, - /* disablement strs */ NULL, NULL }, - - { /* entry idx, value */ 33, VALUE_OPT_SRPUSERNAME, - /* equiv idx, value */ 33, VALUE_OPT_SRPUSERNAME, + { /* entry idx, value */ 28, VALUE_OPT_SRPUSERNAME, + /* equiv idx, value */ 28, VALUE_OPT_SRPUSERNAME, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SRPUSERNAME_FLAGS, 0, @@ -1454,8 +1310,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SRPUSERNAME_DESC, SRPUSERNAME_NAME, SRPUSERNAME_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 34, VALUE_OPT_SRPPASSWD, - /* equiv idx, value */ 34, VALUE_OPT_SRPPASSWD, + { /* entry idx, value */ 29, VALUE_OPT_SRPPASSWD, + /* equiv idx, value */ 29, VALUE_OPT_SRPPASSWD, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SRPPASSWD_FLAGS, 0, @@ -1466,8 +1322,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SRPPASSWD_DESC, SRPPASSWD_NAME, SRPPASSWD_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 35, VALUE_OPT_PSKUSERNAME, - /* equiv idx, value */ 35, VALUE_OPT_PSKUSERNAME, + { /* entry idx, value */ 30, VALUE_OPT_PSKUSERNAME, + /* equiv idx, value */ 30, VALUE_OPT_PSKUSERNAME, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PSKUSERNAME_FLAGS, 0, @@ -1478,8 +1334,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PSKUSERNAME_DESC, PSKUSERNAME_NAME, PSKUSERNAME_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 36, VALUE_OPT_PSKKEY, - /* equiv idx, value */ 36, VALUE_OPT_PSKKEY, + { /* entry idx, value */ 31, VALUE_OPT_PSKKEY, + /* equiv idx, value */ 31, VALUE_OPT_PSKKEY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PSKKEY_FLAGS, 0, @@ -1490,8 +1346,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PSKKEY_DESC, PSKKEY_NAME, PSKKEY_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 37, VALUE_OPT_PORT, - /* equiv idx, value */ 37, VALUE_OPT_PORT, + { /* entry idx, value */ 32, VALUE_OPT_PORT, + /* equiv idx, value */ 32, VALUE_OPT_PORT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PORT_FLAGS, 0, @@ -1502,8 +1358,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PORT_DESC, PORT_NAME, PORT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 38, VALUE_OPT_INSECURE, - /* equiv idx, value */ 38, VALUE_OPT_INSECURE, + { /* entry idx, value */ 33, VALUE_OPT_INSECURE, + /* equiv idx, value */ 33, VALUE_OPT_INSECURE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ INSECURE_FLAGS, 0, @@ -1514,8 +1370,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ INSECURE_DESC, INSECURE_NAME, INSECURE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 39, VALUE_OPT_RANGES, - /* equiv idx, value */ 39, VALUE_OPT_RANGES, + { /* entry idx, value */ 34, VALUE_OPT_RANGES, + /* equiv idx, value */ 34, VALUE_OPT_RANGES, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ RANGES_FLAGS, 0, @@ -1526,8 +1382,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ RANGES_DESC, RANGES_NAME, RANGES_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 40, VALUE_OPT_BENCHMARK_CIPHERS, - /* equiv idx, value */ 40, VALUE_OPT_BENCHMARK_CIPHERS, + { /* entry idx, value */ 35, VALUE_OPT_BENCHMARK_CIPHERS, + /* equiv idx, value */ 35, VALUE_OPT_BENCHMARK_CIPHERS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ BENCHMARK_CIPHERS_FLAGS, 0, @@ -1538,8 +1394,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ BENCHMARK_CIPHERS_DESC, BENCHMARK_CIPHERS_NAME, BENCHMARK_CIPHERS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 41, VALUE_OPT_BENCHMARK_TLS_KX, - /* equiv idx, value */ 41, VALUE_OPT_BENCHMARK_TLS_KX, + { /* entry idx, value */ 36, VALUE_OPT_BENCHMARK_TLS_KX, + /* equiv idx, value */ 36, VALUE_OPT_BENCHMARK_TLS_KX, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ BENCHMARK_TLS_KX_FLAGS, 0, @@ -1550,8 +1406,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ BENCHMARK_TLS_KX_DESC, BENCHMARK_TLS_KX_NAME, BENCHMARK_TLS_KX_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 42, VALUE_OPT_BENCHMARK_TLS_CIPHERS, - /* equiv idx, value */ 42, VALUE_OPT_BENCHMARK_TLS_CIPHERS, + { /* entry idx, value */ 37, VALUE_OPT_BENCHMARK_TLS_CIPHERS, + /* equiv idx, value */ 37, VALUE_OPT_BENCHMARK_TLS_CIPHERS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ BENCHMARK_TLS_CIPHERS_FLAGS, 0, @@ -1562,8 +1418,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ BENCHMARK_TLS_CIPHERS_DESC, BENCHMARK_TLS_CIPHERS_NAME, BENCHMARK_TLS_CIPHERS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 43, VALUE_OPT_LIST, - /* equiv idx, value */ 43, VALUE_OPT_LIST, + { /* entry idx, value */ 38, VALUE_OPT_LIST, + /* equiv idx, value */ 38, VALUE_OPT_LIST, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ LIST_FLAGS, 0, @@ -1574,8 +1430,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ LIST_DESC, LIST_NAME, LIST_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 44, VALUE_OPT_PRIORITY_LIST, - /* equiv idx, value */ 44, VALUE_OPT_PRIORITY_LIST, + { /* entry idx, value */ 39, VALUE_OPT_PRIORITY_LIST, + /* equiv idx, value */ 39, VALUE_OPT_PRIORITY_LIST, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PRIORITY_LIST_FLAGS, 0, @@ -1586,8 +1442,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PRIORITY_LIST_DESC, PRIORITY_LIST_NAME, PRIORITY_LIST_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 45, VALUE_OPT_NOTICKET, - /* equiv idx, value */ 45, VALUE_OPT_NOTICKET, + { /* entry idx, value */ 40, VALUE_OPT_NOTICKET, + /* equiv idx, value */ 40, VALUE_OPT_NOTICKET, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NOTICKET_FLAGS, 0, @@ -1598,8 +1454,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ NOTICKET_DESC, NOTICKET_NAME, NOTICKET_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 46, VALUE_OPT_SRTP_PROFILES, - /* equiv idx, value */ 46, VALUE_OPT_SRTP_PROFILES, + { /* entry idx, value */ 41, VALUE_OPT_SRTP_PROFILES, + /* equiv idx, value */ 41, VALUE_OPT_SRTP_PROFILES, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SRTP_PROFILES_FLAGS, 0, @@ -1610,8 +1466,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SRTP_PROFILES_DESC, SRTP_PROFILES_NAME, SRTP_PROFILES_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 47, VALUE_OPT_ALPN, - /* equiv idx, value */ 47, VALUE_OPT_ALPN, + { /* entry idx, value */ 42, VALUE_OPT_ALPN, + /* equiv idx, value */ 42, VALUE_OPT_ALPN, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ ALPN_FLAGS, 0, @@ -1622,8 +1478,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ ALPN_DESC, ALPN_NAME, ALPN_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 48, VALUE_OPT_HEARTBEAT, - /* equiv idx, value */ 48, VALUE_OPT_HEARTBEAT, + { /* entry idx, value */ 43, VALUE_OPT_HEARTBEAT, + /* equiv idx, value */ 43, VALUE_OPT_HEARTBEAT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ HEARTBEAT_FLAGS, 0, @@ -1634,8 +1490,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ HEARTBEAT_DESC, HEARTBEAT_NAME, HEARTBEAT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 49, VALUE_OPT_RECORDSIZE, - /* equiv idx, value */ 49, VALUE_OPT_RECORDSIZE, + { /* entry idx, value */ 44, VALUE_OPT_RECORDSIZE, + /* equiv idx, value */ 44, VALUE_OPT_RECORDSIZE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ RECORDSIZE_FLAGS, 0, @@ -1646,8 +1502,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ RECORDSIZE_DESC, RECORDSIZE_NAME, RECORDSIZE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 50, VALUE_OPT_DISABLE_SNI, - /* equiv idx, value */ 50, VALUE_OPT_DISABLE_SNI, + { /* entry idx, value */ 45, VALUE_OPT_DISABLE_SNI, + /* equiv idx, value */ 45, VALUE_OPT_DISABLE_SNI, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ DISABLE_SNI_FLAGS, 0, @@ -1658,8 +1514,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ DISABLE_SNI_DESC, DISABLE_SNI_NAME, DISABLE_SNI_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 51, VALUE_OPT_DISABLE_EXTENSIONS, - /* equiv idx, value */ 51, VALUE_OPT_DISABLE_EXTENSIONS, + { /* entry idx, value */ 46, VALUE_OPT_DISABLE_EXTENSIONS, + /* equiv idx, value */ 46, VALUE_OPT_DISABLE_EXTENSIONS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ DISABLE_EXTENSIONS_FLAGS, 0, @@ -1670,8 +1526,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ DISABLE_EXTENSIONS_DESC, DISABLE_EXTENSIONS_NAME, DISABLE_EXTENSIONS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 52, VALUE_OPT_INLINE_COMMANDS, - /* equiv idx, value */ 52, VALUE_OPT_INLINE_COMMANDS, + { /* entry idx, value */ 47, VALUE_OPT_INLINE_COMMANDS, + /* equiv idx, value */ 47, VALUE_OPT_INLINE_COMMANDS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ INLINE_COMMANDS_FLAGS, 0, @@ -1682,8 +1538,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 */ 53, VALUE_OPT_INLINE_COMMANDS_PREFIX, - /* equiv idx, value */ 53, VALUE_OPT_INLINE_COMMANDS_PREFIX, + { /* entry idx, value */ 48, VALUE_OPT_INLINE_COMMANDS_PREFIX, + /* equiv idx, value */ 48, VALUE_OPT_INLINE_COMMANDS_PREFIX, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ INLINE_COMMANDS_PREFIX_FLAGS, 0, @@ -1694,8 +1550,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 */ 54, VALUE_OPT_PROVIDER, - /* equiv idx, value */ 54, VALUE_OPT_PROVIDER, + { /* entry idx, value */ 49, VALUE_OPT_PROVIDER, + /* equiv idx, value */ 49, VALUE_OPT_PROVIDER, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PROVIDER_FLAGS, 0, @@ -1706,8 +1562,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PROVIDER_DESC, PROVIDER_NAME, PROVIDER_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 55, VALUE_OPT_FIPS140_MODE, - /* equiv idx, value */ 55, VALUE_OPT_FIPS140_MODE, + { /* entry idx, value */ 50, VALUE_OPT_FIPS140_MODE, + /* equiv idx, value */ 50, VALUE_OPT_FIPS140_MODE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ FIPS140_MODE_FLAGS, 0, @@ -1760,21 +1616,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of gnutls-cli. */ -#define zPROGNAME (gnutls_cli_opt_strs+4397) +#define zPROGNAME (gnutls_cli_opt_strs+4118) /** Reference to the title line for gnutls-cli usage. */ -#define zUsageTitle (gnutls_cli_opt_strs+4408) +#define zUsageTitle (gnutls_cli_opt_strs+4129) /** 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+4504) +#define zBugsAddr (gnutls_cli_opt_strs+4225) /** Clarification/explanation of what gnutls-cli does. */ -#define zExplain (gnutls_cli_opt_strs+4524) +#define zExplain (gnutls_cli_opt_strs+4245) /** Extra detail explaining what gnutls-cli does. */ -#define zDetail (gnutls_cli_opt_strs+4526) +#define zDetail (gnutls_cli_opt_strs+4247) /** The full version string for gnutls-cli. */ -#define zFullVersion (gnutls_cli_opt_strs+4709) +#define zFullVersion (gnutls_cli_opt_strs+4430) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -1786,7 +1642,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define gnutls_cli_full_usage (NULL) -#define gnutls_cli_short_usage (gnutls_cli_opt_strs+4730) +#define gnutls_cli_short_usage (gnutls_cli_opt_strs+4451) #endif /* not defined __doxygen__ */ @@ -1924,78 +1780,6 @@ 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. - */ -static void -doOptPgpkeyfile(tOptions* pOptions, tOptDesc* pOptDesc) -{ - static teOptFileType const type = - FTYPE_MODE_MUST_EXIST + FTYPE_MODE_NO_OPEN; - static tuFileMode mode; -#ifndef O_CLOEXEC -# define O_CLOEXEC 0 -#endif - mode.file_flags = O_CLOEXEC; - - /* - * This function handles special invalid values for "pOptions" - */ - optionFileCheck(pOptions, pOptDesc, type, mode); -} - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/** - * 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. - */ -static void -doOptPgpkeyring(tOptions* pOptions, tOptDesc* pOptDesc) -{ - static teOptFileType const type = - FTYPE_MODE_MUST_EXIST + FTYPE_MODE_NO_OPEN; - static tuFileMode mode; -#ifndef O_CLOEXEC -# define O_CLOEXEC 0 -#endif - mode.file_flags = O_CLOEXEC; - - /* - * This function handles special invalid values for "pOptions" - */ - optionFileCheck(pOptions, pOptDesc, type, mode); -} - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/** - * 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. - */ -static void -doOptPgpcertfile(tOptions* pOptions, tOptDesc* pOptDesc) -{ - static teOptFileType const type = - FTYPE_MODE_MUST_EXIST + FTYPE_MODE_NO_OPEN; - static tuFileMode mode; -#ifndef O_CLOEXEC -# define O_CLOEXEC 0 -#endif - mode.file_flags = O_CLOEXEC; - - /* - * This function handles special invalid values for "pOptions" - */ - optionFileCheck(pOptions, pOptDesc, type, mode); -} - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/** * Code to handle the recordsize option. * * @param[in] pOptions the gnutls-cli options data structure @@ -2117,7 +1901,7 @@ tOptions gnutls_cliOptions = { NO_EQUIVALENT, /* '-#' option index */ NO_EQUIVALENT /* index of default opt */ }, - 59 /* full option count */, 56 /* user option count */, + 54 /* full option count */, 51 /* user option count */, gnutls_cli_full_usage, gnutls_cli_short_usage, NULL, NULL, PKGDATADIR, gnutls_cli_packager_info @@ -2329,9 +2113,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.\n")); 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 */ @@ -2353,24 +2134,12 @@ with this program. If not, see <http://www.gnu.org/licenses/>.\n")); 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 */ diff --git a/src/cli-args.h.bak b/src/cli-args.h.bak index b7edc1d99a..70a2efc385 100644 --- a/src/cli-args.h.bak +++ b/src/cli-args.h.bak @@ -85,49 +85,44 @@ typedef enum { INDEX_OPT_CRLF = 16, INDEX_OPT_FASTOPEN = 17, INDEX_OPT_X509FMTDER = 18, - INDEX_OPT_FINGERPRINT = 19, - INDEX_OPT_PRINT_CERT = 20, - INDEX_OPT_SAVE_CERT = 21, - INDEX_OPT_SAVE_OCSP = 22, - INDEX_OPT_DH_BITS = 23, - INDEX_OPT_PRIORITY = 24, - INDEX_OPT_X509CAFILE = 25, - INDEX_OPT_X509CRLFILE = 26, - INDEX_OPT_PGPKEYFILE = 27, - INDEX_OPT_PGPKEYRING = 28, - INDEX_OPT_PGPCERTFILE = 29, - INDEX_OPT_X509KEYFILE = 30, - INDEX_OPT_X509CERTFILE = 31, - INDEX_OPT_PGPSUBKEY = 32, - INDEX_OPT_SRPUSERNAME = 33, - INDEX_OPT_SRPPASSWD = 34, - INDEX_OPT_PSKUSERNAME = 35, - INDEX_OPT_PSKKEY = 36, - INDEX_OPT_PORT = 37, - INDEX_OPT_INSECURE = 38, - INDEX_OPT_RANGES = 39, - INDEX_OPT_BENCHMARK_CIPHERS = 40, - INDEX_OPT_BENCHMARK_TLS_KX = 41, - INDEX_OPT_BENCHMARK_TLS_CIPHERS = 42, - INDEX_OPT_LIST = 43, - INDEX_OPT_PRIORITY_LIST = 44, - INDEX_OPT_NOTICKET = 45, - INDEX_OPT_SRTP_PROFILES = 46, - INDEX_OPT_ALPN = 47, - INDEX_OPT_HEARTBEAT = 48, - INDEX_OPT_RECORDSIZE = 49, - INDEX_OPT_DISABLE_SNI = 50, - INDEX_OPT_DISABLE_EXTENSIONS = 51, - INDEX_OPT_INLINE_COMMANDS = 52, - INDEX_OPT_INLINE_COMMANDS_PREFIX = 53, - INDEX_OPT_PROVIDER = 54, - INDEX_OPT_FIPS140_MODE = 55, - INDEX_OPT_VERSION = 56, - INDEX_OPT_HELP = 57, - INDEX_OPT_MORE_HELP = 58 + INDEX_OPT_PRINT_CERT = 19, + INDEX_OPT_SAVE_CERT = 20, + INDEX_OPT_SAVE_OCSP = 21, + INDEX_OPT_DH_BITS = 22, + INDEX_OPT_PRIORITY = 23, + INDEX_OPT_X509CAFILE = 24, + INDEX_OPT_X509CRLFILE = 25, + INDEX_OPT_X509KEYFILE = 26, + INDEX_OPT_X509CERTFILE = 27, + INDEX_OPT_SRPUSERNAME = 28, + INDEX_OPT_SRPPASSWD = 29, + INDEX_OPT_PSKUSERNAME = 30, + INDEX_OPT_PSKKEY = 31, + INDEX_OPT_PORT = 32, + INDEX_OPT_INSECURE = 33, + INDEX_OPT_RANGES = 34, + INDEX_OPT_BENCHMARK_CIPHERS = 35, + INDEX_OPT_BENCHMARK_TLS_KX = 36, + INDEX_OPT_BENCHMARK_TLS_CIPHERS = 37, + INDEX_OPT_LIST = 38, + INDEX_OPT_PRIORITY_LIST = 39, + INDEX_OPT_NOTICKET = 40, + INDEX_OPT_SRTP_PROFILES = 41, + INDEX_OPT_ALPN = 42, + INDEX_OPT_HEARTBEAT = 43, + INDEX_OPT_RECORDSIZE = 44, + INDEX_OPT_DISABLE_SNI = 45, + INDEX_OPT_DISABLE_EXTENSIONS = 46, + INDEX_OPT_INLINE_COMMANDS = 47, + INDEX_OPT_INLINE_COMMANDS_PREFIX = 48, + INDEX_OPT_PROVIDER = 49, + INDEX_OPT_FIPS140_MODE = 50, + INDEX_OPT_VERSION = 51, + INDEX_OPT_HELP = 52, + INDEX_OPT_MORE_HELP = 53 } teOptIndex; /** count of all options for gnutls-cli */ -#define OPTION_CT 59 +#define OPTION_CT 54 /** gnutls-cli version */ #define GNUTLS_CLI_VERSION "@VERSION@" /** Full gnutls-cli version text */ @@ -205,7 +200,6 @@ typedef enum { #define VALUE_OPT_CRLF 0x100B #define VALUE_OPT_FASTOPEN 0x100C #define VALUE_OPT_X509FMTDER 0x100D -#define VALUE_OPT_FINGERPRINT 'f' #define VALUE_OPT_PRINT_CERT 0x100E #define VALUE_OPT_SAVE_CERT 0x100F #define VALUE_OPT_SAVE_OCSP 0x1010 @@ -215,37 +209,33 @@ typedef enum { #define VALUE_OPT_PRIORITY 0x1012 #define VALUE_OPT_X509CAFILE 0x1013 #define VALUE_OPT_X509CRLFILE 0x1014 -#define VALUE_OPT_PGPKEYFILE 0x1015 -#define VALUE_OPT_PGPKEYRING 0x1016 -#define VALUE_OPT_PGPCERTFILE 0x1017 -#define VALUE_OPT_X509KEYFILE 0x1018 -#define VALUE_OPT_X509CERTFILE 0x1019 -#define VALUE_OPT_PGPSUBKEY 0x101A -#define VALUE_OPT_SRPUSERNAME 0x101B -#define VALUE_OPT_SRPPASSWD 0x101C -#define VALUE_OPT_PSKUSERNAME 0x101D -#define VALUE_OPT_PSKKEY 0x101E +#define VALUE_OPT_X509KEYFILE 0x1015 +#define VALUE_OPT_X509CERTFILE 0x1016 +#define VALUE_OPT_SRPUSERNAME 0x1017 +#define VALUE_OPT_SRPPASSWD 0x1018 +#define VALUE_OPT_PSKUSERNAME 0x1019 +#define VALUE_OPT_PSKKEY 0x101A #define VALUE_OPT_PORT 'p' -#define VALUE_OPT_INSECURE 0x101F -#define VALUE_OPT_RANGES 0x1020 -#define VALUE_OPT_BENCHMARK_CIPHERS 0x1021 -#define VALUE_OPT_BENCHMARK_TLS_KX 0x1022 -#define VALUE_OPT_BENCHMARK_TLS_CIPHERS 0x1023 +#define VALUE_OPT_INSECURE 0x101B +#define VALUE_OPT_RANGES 0x101C +#define VALUE_OPT_BENCHMARK_CIPHERS 0x101D +#define VALUE_OPT_BENCHMARK_TLS_KX 0x101E +#define VALUE_OPT_BENCHMARK_TLS_CIPHERS 0x101F #define VALUE_OPT_LIST 'l' -#define VALUE_OPT_PRIORITY_LIST 0x1024 -#define VALUE_OPT_NOTICKET 0x1025 -#define VALUE_OPT_SRTP_PROFILES 0x1026 -#define VALUE_OPT_ALPN 0x1027 +#define VALUE_OPT_PRIORITY_LIST 0x1020 +#define VALUE_OPT_NOTICKET 0x1021 +#define VALUE_OPT_SRTP_PROFILES 0x1022 +#define VALUE_OPT_ALPN 0x1023 #define VALUE_OPT_HEARTBEAT 'b' -#define VALUE_OPT_RECORDSIZE 0x1028 +#define VALUE_OPT_RECORDSIZE 0x1024 #define OPT_VALUE_RECORDSIZE (DESC(RECORDSIZE).optArg.argInt) -#define VALUE_OPT_DISABLE_SNI 0x1029 -#define VALUE_OPT_DISABLE_EXTENSIONS 0x102A -#define VALUE_OPT_INLINE_COMMANDS 0x102B -#define VALUE_OPT_INLINE_COMMANDS_PREFIX 0x102C -#define VALUE_OPT_PROVIDER 0x102D -#define VALUE_OPT_FIPS140_MODE 0x102E +#define VALUE_OPT_DISABLE_SNI 0x1025 +#define VALUE_OPT_DISABLE_EXTENSIONS 0x1026 +#define VALUE_OPT_INLINE_COMMANDS 0x1027 +#define VALUE_OPT_INLINE_COMMANDS_PREFIX 0x1028 +#define VALUE_OPT_PROVIDER 0x1029 +#define VALUE_OPT_FIPS140_MODE 0x102A /** option flag (value) for help-value option */ #define VALUE_OPT_HELP 'h' /** option flag (value) for more-help-value option */ diff --git a/src/serv-args.c.bak b/src/serv-args.c.bak index 5eee5e7bd3..6767335221 100644 --- a/src/serv-args.c.bak +++ b/src/serv-args.c.bak @@ -63,7 +63,7 @@ extern FILE * option_usage_fp; /** * static const strings for gnutls-serv options */ -static char const gnutls_serv_opt_strs[3307] = +static char const gnutls_serv_opt_strs[3156] = /* 0 */ "gnutls-serv @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" @@ -142,68 +142,59 @@ static char const gnutls_serv_opt_strs[3307] = /* 1929 */ "CRL file to use\0" /* 1945 */ "X509CRLFILE\0" /* 1957 */ "x509crlfile\0" -/* 1969 */ "PGP Key file to use\0" -/* 1989 */ "PGPKEYFILE\0" -/* 2000 */ "pgpkeyfile\0" -/* 2011 */ "PGP Key ring file to use\0" -/* 2036 */ "PGPKEYRING\0" -/* 2047 */ "pgpkeyring\0" -/* 2058 */ "PGP Public Key (certificate) file to use\0" -/* 2099 */ "PGPCERTFILE\0" -/* 2111 */ "pgpcertfile\0" -/* 2123 */ "X.509 key file or PKCS #11 URL to use\0" -/* 2161 */ "X509KEYFILE\0" -/* 2173 */ "x509keyfile\0" -/* 2185 */ "X.509 Certificate file or PKCS #11 URL to use\0" -/* 2231 */ "X509CERTFILE\0" -/* 2244 */ "x509certfile\0" -/* 2257 */ "an alias for the 'x509keyfile' option (deprecated)\0" -/* 2308 */ "x509dsakeyfile\0" -/* 2323 */ "an alias for the 'x509certfile' option (deprecated)\0" -/* 2375 */ "x509dsacertfile\0" -/* 2391 */ "x509ecckeyfile\0" -/* 2406 */ "x509ecccertfile\0" -/* 2422 */ "PGP subkey to use (hex or auto)\0" -/* 2454 */ "PGPSUBKEY\0" -/* 2464 */ "pgpsubkey\0" -/* 2474 */ "SRP password file to use\0" -/* 2499 */ "SRPPASSWD\0" -/* 2509 */ "srppasswd\0" -/* 2519 */ "SRP password configuration file to use\0" -/* 2558 */ "SRPPASSWDCONF\0" -/* 2572 */ "srppasswdconf\0" -/* 2586 */ "PSK password file to use\0" -/* 2611 */ "PSKPASSWD\0" -/* 2621 */ "pskpasswd\0" -/* 2631 */ "PSK identity hint to use\0" -/* 2656 */ "PSKHINT\0" -/* 2664 */ "pskhint\0" -/* 2672 */ "The OCSP response to send to client\0" -/* 2708 */ "OCSP_RESPONSE\0" -/* 2722 */ "ocsp-response\0" -/* 2736 */ "The port to connect to\0" -/* 2759 */ "PORT\0" -/* 2764 */ "port\0" -/* 2769 */ "Print a list of the supported algorithms and modes\0" -/* 2820 */ "LIST\0" -/* 2825 */ "list\0" -/* 2830 */ "Specify the PKCS #11 provider library\0" -/* 2868 */ "PROVIDER\0" -/* 2877 */ "provider\0" -/* 2886 */ "display extended usage information and exit\0" -/* 2930 */ "help\0" -/* 2935 */ "extended usage information passed thru pager\0" -/* 2980 */ "more-help\0" -/* 2990 */ "output version information and exit\0" -/* 3026 */ "version\0" -/* 3034 */ "GNUTLS_SERV\0" -/* 3046 */ "gnutls-serv - GnuTLS server\n" +/* 1969 */ "PGP Key file to use (deprecated)\0" +/* 2002 */ "PGPKEYFILE\0" +/* 2013 */ "pgpkeyfile\0" +/* 2024 */ "X.509 key file or PKCS #11 URL to use\0" +/* 2062 */ "X509KEYFILE\0" +/* 2074 */ "x509keyfile\0" +/* 2086 */ "X.509 Certificate file or PKCS #11 URL to use\0" +/* 2132 */ "X509CERTFILE\0" +/* 2145 */ "x509certfile\0" +/* 2158 */ "an alias for the 'x509keyfile' option (deprecated)\0" +/* 2209 */ "x509dsakeyfile\0" +/* 2224 */ "an alias for the 'x509certfile' option (deprecated)\0" +/* 2276 */ "x509dsacertfile\0" +/* 2292 */ "x509ecckeyfile\0" +/* 2307 */ "x509ecccertfile\0" +/* 2323 */ "SRP password file to use\0" +/* 2348 */ "SRPPASSWD\0" +/* 2358 */ "srppasswd\0" +/* 2368 */ "SRP password configuration file to use\0" +/* 2407 */ "SRPPASSWDCONF\0" +/* 2421 */ "srppasswdconf\0" +/* 2435 */ "PSK password file to use\0" +/* 2460 */ "PSKPASSWD\0" +/* 2470 */ "pskpasswd\0" +/* 2480 */ "PSK identity hint to use\0" +/* 2505 */ "PSKHINT\0" +/* 2513 */ "pskhint\0" +/* 2521 */ "The OCSP response to send to client\0" +/* 2557 */ "OCSP_RESPONSE\0" +/* 2571 */ "ocsp-response\0" +/* 2585 */ "The port to connect to\0" +/* 2608 */ "PORT\0" +/* 2613 */ "port\0" +/* 2618 */ "Print a list of the supported algorithms and modes\0" +/* 2669 */ "LIST\0" +/* 2674 */ "list\0" +/* 2679 */ "Specify the PKCS #11 provider library\0" +/* 2717 */ "PROVIDER\0" +/* 2726 */ "provider\0" +/* 2735 */ "display extended usage information and exit\0" +/* 2779 */ "help\0" +/* 2784 */ "extended usage information passed thru pager\0" +/* 2829 */ "more-help\0" +/* 2839 */ "output version information and exit\0" +/* 2875 */ "version\0" +/* 2883 */ "GNUTLS_SERV\0" +/* 2895 */ "gnutls-serv - GnuTLS server\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" -/* 3132 */ "@PACKAGE_BUGREPORT@\0" -/* 3152 */ "\n\0" -/* 3154 */ "Server program that listens to incoming TLS connections.\n\0" -/* 3212 */ "gnutls-serv @VERSION@\0" -/* 3234 */ "Usage: gnutls-serv [options]\n" +/* 2981 */ "@PACKAGE_BUGREPORT@\0" +/* 3001 */ "\n\0" +/* 3003 */ "Server program that listens to incoming TLS connections.\n\0" +/* 3061 */ "gnutls-serv @VERSION@\0" +/* 3083 */ "Usage: gnutls-serv [options]\n" "gnutls-serv --help for usage instructions.\n"; /** @@ -472,48 +463,22 @@ static char const gnutls_serv_opt_strs[3307] = /** Descriptive text for the pgpkeyfile option */ #define PGPKEYFILE_DESC (gnutls_serv_opt_strs+1969) /** Upper-cased name for the pgpkeyfile option */ -#define PGPKEYFILE_NAME (gnutls_serv_opt_strs+1989) +#define PGPKEYFILE_NAME (gnutls_serv_opt_strs+2002) /** Name string for the pgpkeyfile option */ -#define PGPKEYFILE_name (gnutls_serv_opt_strs+2000) +#define PGPKEYFILE_name (gnutls_serv_opt_strs+2013) /** Compiled in flag settings for the pgpkeyfile option */ -#define PGPKEYFILE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) - -/** - * pgpkeyring option description: - */ -/** Descriptive text for the pgpkeyring option */ -#define PGPKEYRING_DESC (gnutls_serv_opt_strs+2011) -/** Upper-cased name for the pgpkeyring option */ -#define PGPKEYRING_NAME (gnutls_serv_opt_strs+2036) -/** Name string for the pgpkeyring option */ -#define PGPKEYRING_name (gnutls_serv_opt_strs+2047) -/** Compiled in flag settings for the pgpkeyring option */ -#define PGPKEYRING_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) - -/** - * pgpcertfile option description: - */ -/** Descriptive text for the pgpcertfile option */ -#define PGPCERTFILE_DESC (gnutls_serv_opt_strs+2058) -/** Upper-cased name for the pgpcertfile option */ -#define PGPCERTFILE_NAME (gnutls_serv_opt_strs+2099) -/** Name string for the pgpcertfile option */ -#define PGPCERTFILE_name (gnutls_serv_opt_strs+2111) -/** Compiled in flag settings for the pgpcertfile option */ -#define PGPCERTFILE_FLAGS (OPTST_DISABLED \ +#define PGPKEYFILE_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /** * x509keyfile option description: */ /** Descriptive text for the x509keyfile option */ -#define X509KEYFILE_DESC (gnutls_serv_opt_strs+2123) +#define X509KEYFILE_DESC (gnutls_serv_opt_strs+2024) /** Upper-cased name for the x509keyfile option */ -#define X509KEYFILE_NAME (gnutls_serv_opt_strs+2161) +#define X509KEYFILE_NAME (gnutls_serv_opt_strs+2062) /** Name string for the x509keyfile option */ -#define X509KEYFILE_name (gnutls_serv_opt_strs+2173) +#define X509KEYFILE_name (gnutls_serv_opt_strs+2074) /** Compiled in flag settings for the x509keyfile option */ #define X509KEYFILE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -522,11 +487,11 @@ static char const gnutls_serv_opt_strs[3307] = * x509certfile option description: */ /** Descriptive text for the x509certfile option */ -#define X509CERTFILE_DESC (gnutls_serv_opt_strs+2185) +#define X509CERTFILE_DESC (gnutls_serv_opt_strs+2086) /** Upper-cased name for the x509certfile option */ -#define X509CERTFILE_NAME (gnutls_serv_opt_strs+2231) +#define X509CERTFILE_NAME (gnutls_serv_opt_strs+2132) /** Name string for the x509certfile option */ -#define X509CERTFILE_name (gnutls_serv_opt_strs+2244) +#define X509CERTFILE_name (gnutls_serv_opt_strs+2145) /** Compiled in flag settings for the x509certfile option */ #define X509CERTFILE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -535,10 +500,10 @@ static char const gnutls_serv_opt_strs[3307] = * x509dsakeyfile option description: */ /** Descriptive text for the x509dsakeyfile option */ -#define X509DSAKEYFILE_DESC (gnutls_serv_opt_strs+2257) +#define X509DSAKEYFILE_DESC (gnutls_serv_opt_strs+2158) #define X509DSAKEYFILE_NAME NULL /** Unmodified name string for the x509dsakeyfile option */ -#define X509DSAKEYFILE_name (gnutls_serv_opt_strs+2308) +#define X509DSAKEYFILE_name (gnutls_serv_opt_strs+2209) /** Compiled in flag settings for the x509dsakeyfile option */ #define X509DSAKEYFILE_FLAGS (X509KEYFILE_FLAGS | OPTST_ALIAS | OPTST_DEPRECATED) @@ -546,10 +511,10 @@ static char const gnutls_serv_opt_strs[3307] = * x509dsacertfile option description: */ /** Descriptive text for the x509dsacertfile option */ -#define X509DSACERTFILE_DESC (gnutls_serv_opt_strs+2323) +#define X509DSACERTFILE_DESC (gnutls_serv_opt_strs+2224) #define X509DSACERTFILE_NAME NULL /** Unmodified name string for the x509dsacertfile option */ -#define X509DSACERTFILE_name (gnutls_serv_opt_strs+2375) +#define X509DSACERTFILE_name (gnutls_serv_opt_strs+2276) /** Compiled in flag settings for the x509dsacertfile option */ #define X509DSACERTFILE_FLAGS (X509CERTFILE_FLAGS | OPTST_ALIAS | OPTST_DEPRECATED) @@ -557,10 +522,10 @@ static char const gnutls_serv_opt_strs[3307] = * x509ecckeyfile option description: */ /** Descriptive text for the x509ecckeyfile option */ -#define X509ECCKEYFILE_DESC (gnutls_serv_opt_strs+2257) +#define X509ECCKEYFILE_DESC (gnutls_serv_opt_strs+2158) #define X509ECCKEYFILE_NAME NULL /** Unmodified name string for the x509ecckeyfile option */ -#define X509ECCKEYFILE_name (gnutls_serv_opt_strs+2391) +#define X509ECCKEYFILE_name (gnutls_serv_opt_strs+2292) /** Compiled in flag settings for the x509ecckeyfile option */ #define X509ECCKEYFILE_FLAGS (X509KEYFILE_FLAGS | OPTST_ALIAS | OPTST_DEPRECATED) @@ -568,35 +533,22 @@ static char const gnutls_serv_opt_strs[3307] = * x509ecccertfile option description: */ /** Descriptive text for the x509ecccertfile option */ -#define X509ECCCERTFILE_DESC (gnutls_serv_opt_strs+2323) +#define X509ECCCERTFILE_DESC (gnutls_serv_opt_strs+2224) #define X509ECCCERTFILE_NAME NULL /** Unmodified name string for the x509ecccertfile option */ -#define X509ECCCERTFILE_name (gnutls_serv_opt_strs+2406) +#define X509ECCCERTFILE_name (gnutls_serv_opt_strs+2307) /** Compiled in flag settings for the x509ecccertfile option */ #define X509ECCCERTFILE_FLAGS (X509CERTFILE_FLAGS | OPTST_ALIAS | OPTST_DEPRECATED) /** - * pgpsubkey option description: - */ -/** Descriptive text for the pgpsubkey option */ -#define PGPSUBKEY_DESC (gnutls_serv_opt_strs+2422) -/** Upper-cased name for the pgpsubkey option */ -#define PGPSUBKEY_NAME (gnutls_serv_opt_strs+2454) -/** Name string for the pgpsubkey option */ -#define PGPSUBKEY_name (gnutls_serv_opt_strs+2464) -/** Compiled in flag settings for the pgpsubkey option */ -#define PGPSUBKEY_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) - -/** * srppasswd option description: */ /** Descriptive text for the srppasswd option */ -#define SRPPASSWD_DESC (gnutls_serv_opt_strs+2474) +#define SRPPASSWD_DESC (gnutls_serv_opt_strs+2323) /** Upper-cased name for the srppasswd option */ -#define SRPPASSWD_NAME (gnutls_serv_opt_strs+2499) +#define SRPPASSWD_NAME (gnutls_serv_opt_strs+2348) /** Name string for the srppasswd option */ -#define SRPPASSWD_name (gnutls_serv_opt_strs+2509) +#define SRPPASSWD_name (gnutls_serv_opt_strs+2358) /** Compiled in flag settings for the srppasswd option */ #define SRPPASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -605,11 +557,11 @@ static char const gnutls_serv_opt_strs[3307] = * srppasswdconf option description: */ /** Descriptive text for the srppasswdconf option */ -#define SRPPASSWDCONF_DESC (gnutls_serv_opt_strs+2519) +#define SRPPASSWDCONF_DESC (gnutls_serv_opt_strs+2368) /** Upper-cased name for the srppasswdconf option */ -#define SRPPASSWDCONF_NAME (gnutls_serv_opt_strs+2558) +#define SRPPASSWDCONF_NAME (gnutls_serv_opt_strs+2407) /** Name string for the srppasswdconf option */ -#define SRPPASSWDCONF_name (gnutls_serv_opt_strs+2572) +#define SRPPASSWDCONF_name (gnutls_serv_opt_strs+2421) /** Compiled in flag settings for the srppasswdconf option */ #define SRPPASSWDCONF_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -618,11 +570,11 @@ static char const gnutls_serv_opt_strs[3307] = * pskpasswd option description: */ /** Descriptive text for the pskpasswd option */ -#define PSKPASSWD_DESC (gnutls_serv_opt_strs+2586) +#define PSKPASSWD_DESC (gnutls_serv_opt_strs+2435) /** Upper-cased name for the pskpasswd option */ -#define PSKPASSWD_NAME (gnutls_serv_opt_strs+2611) +#define PSKPASSWD_NAME (gnutls_serv_opt_strs+2460) /** Name string for the pskpasswd option */ -#define PSKPASSWD_name (gnutls_serv_opt_strs+2621) +#define PSKPASSWD_name (gnutls_serv_opt_strs+2470) /** Compiled in flag settings for the pskpasswd option */ #define PSKPASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -631,11 +583,11 @@ static char const gnutls_serv_opt_strs[3307] = * pskhint option description: */ /** Descriptive text for the pskhint option */ -#define PSKHINT_DESC (gnutls_serv_opt_strs+2631) +#define PSKHINT_DESC (gnutls_serv_opt_strs+2480) /** Upper-cased name for the pskhint option */ -#define PSKHINT_NAME (gnutls_serv_opt_strs+2656) +#define PSKHINT_NAME (gnutls_serv_opt_strs+2505) /** Name string for the pskhint option */ -#define PSKHINT_name (gnutls_serv_opt_strs+2664) +#define PSKHINT_name (gnutls_serv_opt_strs+2513) /** Compiled in flag settings for the pskhint option */ #define PSKHINT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -644,11 +596,11 @@ static char const gnutls_serv_opt_strs[3307] = * ocsp-response option description: */ /** Descriptive text for the ocsp-response option */ -#define OCSP_RESPONSE_DESC (gnutls_serv_opt_strs+2672) +#define OCSP_RESPONSE_DESC (gnutls_serv_opt_strs+2521) /** Upper-cased name for the ocsp-response option */ -#define OCSP_RESPONSE_NAME (gnutls_serv_opt_strs+2708) +#define OCSP_RESPONSE_NAME (gnutls_serv_opt_strs+2557) /** Name string for the ocsp-response option */ -#define OCSP_RESPONSE_name (gnutls_serv_opt_strs+2722) +#define OCSP_RESPONSE_name (gnutls_serv_opt_strs+2571) /** Compiled in flag settings for the ocsp-response option */ #define OCSP_RESPONSE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -657,11 +609,11 @@ static char const gnutls_serv_opt_strs[3307] = * port option description: */ /** Descriptive text for the port option */ -#define PORT_DESC (gnutls_serv_opt_strs+2736) +#define PORT_DESC (gnutls_serv_opt_strs+2585) /** Upper-cased name for the port option */ -#define PORT_NAME (gnutls_serv_opt_strs+2759) +#define PORT_NAME (gnutls_serv_opt_strs+2608) /** Name string for the port option */ -#define PORT_name (gnutls_serv_opt_strs+2764) +#define PORT_name (gnutls_serv_opt_strs+2613) /** Compiled in flag settings for the port option */ #define PORT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -670,11 +622,11 @@ static char const gnutls_serv_opt_strs[3307] = * list option description: */ /** Descriptive text for the list option */ -#define LIST_DESC (gnutls_serv_opt_strs+2769) +#define LIST_DESC (gnutls_serv_opt_strs+2618) /** Upper-cased name for the list option */ -#define LIST_NAME (gnutls_serv_opt_strs+2820) +#define LIST_NAME (gnutls_serv_opt_strs+2669) /** Name string for the list option */ -#define LIST_name (gnutls_serv_opt_strs+2825) +#define LIST_name (gnutls_serv_opt_strs+2674) /** Compiled in flag settings for the list option */ #define LIST_FLAGS (OPTST_DISABLED) @@ -682,11 +634,11 @@ static char const gnutls_serv_opt_strs[3307] = * provider option description: */ /** Descriptive text for the provider option */ -#define PROVIDER_DESC (gnutls_serv_opt_strs+2830) +#define PROVIDER_DESC (gnutls_serv_opt_strs+2679) /** Upper-cased name for the provider option */ -#define PROVIDER_NAME (gnutls_serv_opt_strs+2868) +#define PROVIDER_NAME (gnutls_serv_opt_strs+2717) /** Name string for the provider option */ -#define PROVIDER_name (gnutls_serv_opt_strs+2877) +#define PROVIDER_name (gnutls_serv_opt_strs+2726) /** Compiled in flag settings for the provider option */ #define PROVIDER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -694,11 +646,11 @@ static char const gnutls_serv_opt_strs[3307] = /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (gnutls_serv_opt_strs+2886) -#define HELP_name (gnutls_serv_opt_strs+2930) +#define HELP_DESC (gnutls_serv_opt_strs+2735) +#define HELP_name (gnutls_serv_opt_strs+2779) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (gnutls_serv_opt_strs+2935) -#define MORE_HELP_name (gnutls_serv_opt_strs+2980) +#define MORE_HELP_DESC (gnutls_serv_opt_strs+2784) +#define MORE_HELP_name (gnutls_serv_opt_strs+2829) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -711,8 +663,8 @@ static char const gnutls_serv_opt_strs[3307] = # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (gnutls_serv_opt_strs+2990) -#define VER_name (gnutls_serv_opt_strs+3026) +#define VER_DESC (gnutls_serv_opt_strs+2839) +#define VER_name (gnutls_serv_opt_strs+2875) /** * Declare option callback procedures */ @@ -723,11 +675,10 @@ extern tOptProc optionUnstackArg, optionVendorOption; static tOptProc doOptDebug, doOptDhparams, doOptMtu, - doOptOcsp_Response, doOptPgpcertfile, doOptPgpkeyfile, - doOptPgpkeyring, doOptProvider, doOptPskpasswd, - doOptSrppasswd, doOptSrppasswdconf, doOptX509crlfile, - doOptX509dsacertfile, doOptX509dsakeyfile, doOptX509ecccertfile, - doOptX509ecckeyfile, doUsageOpt; + doOptOcsp_Response, doOptPgpkeyfile, doOptProvider, + doOptPskpasswd, doOptSrppasswd, doOptSrppasswdconf, + doOptX509crlfile, doOptX509dsacertfile, doOptX509dsakeyfile, + doOptX509ecccertfile, doOptX509ecckeyfile, doUsageOpt; #define VER_PROC optionPrintVersion /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -1001,32 +952,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PGPKEYFILE_DESC, PGPKEYFILE_NAME, PGPKEYFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 22, VALUE_OPT_PGPKEYRING, - /* equiv idx, value */ 22, VALUE_OPT_PGPKEYRING, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PGPKEYRING_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --pgpkeyring */ - /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, - /* option proc */ doOptPgpkeyring, - /* desc, NAME, name */ PGPKEYRING_DESC, PGPKEYRING_NAME, PGPKEYRING_name, - /* disablement strs */ NULL, NULL }, - - { /* entry idx, value */ 23, VALUE_OPT_PGPCERTFILE, - /* equiv idx, value */ 23, VALUE_OPT_PGPCERTFILE, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PGPCERTFILE_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --pgpcertfile */ - /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, - /* option proc */ doOptPgpcertfile, - /* desc, NAME, name */ PGPCERTFILE_DESC, PGPCERTFILE_NAME, PGPCERTFILE_name, - /* disablement strs */ NULL, NULL }, - - { /* entry idx, value */ 24, VALUE_OPT_X509KEYFILE, - /* equiv idx, value */ 24, VALUE_OPT_X509KEYFILE, + { /* entry idx, value */ 22, VALUE_OPT_X509KEYFILE, + /* equiv idx, value */ 22, VALUE_OPT_X509KEYFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ X509KEYFILE_FLAGS, 0, @@ -1037,8 +964,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509KEYFILE_DESC, X509KEYFILE_NAME, X509KEYFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 25, VALUE_OPT_X509CERTFILE, - /* equiv idx, value */ 25, VALUE_OPT_X509CERTFILE, + { /* entry idx, value */ 23, VALUE_OPT_X509CERTFILE, + /* equiv idx, value */ 23, VALUE_OPT_X509CERTFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ X509CERTFILE_FLAGS, 0, @@ -1049,8 +976,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509CERTFILE_DESC, X509CERTFILE_NAME, X509CERTFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 26, VALUE_OPT_X509DSAKEYFILE, - /* equiv idx, value */ 26, VALUE_OPT_X509DSAKEYFILE, + { /* entry idx, value */ 24, VALUE_OPT_X509DSAKEYFILE, + /* equiv idx, value */ 24, VALUE_OPT_X509DSAKEYFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509DSAKEYFILE_FLAGS, 0, @@ -1061,8 +988,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509DSAKEYFILE_DESC, X509DSAKEYFILE_NAME, X509DSAKEYFILE_name, /* disablement strs */ 0, 0 }, - { /* entry idx, value */ 27, VALUE_OPT_X509DSACERTFILE, - /* equiv idx, value */ 27, VALUE_OPT_X509DSACERTFILE, + { /* entry idx, value */ 25, VALUE_OPT_X509DSACERTFILE, + /* equiv idx, value */ 25, VALUE_OPT_X509DSACERTFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509DSACERTFILE_FLAGS, 0, @@ -1073,8 +1000,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509DSACERTFILE_DESC, X509DSACERTFILE_NAME, X509DSACERTFILE_name, /* disablement strs */ 0, 0 }, - { /* entry idx, value */ 28, VALUE_OPT_X509ECCKEYFILE, - /* equiv idx, value */ 28, VALUE_OPT_X509ECCKEYFILE, + { /* entry idx, value */ 26, VALUE_OPT_X509ECCKEYFILE, + /* equiv idx, value */ 26, VALUE_OPT_X509ECCKEYFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509ECCKEYFILE_FLAGS, 0, @@ -1085,8 +1012,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509ECCKEYFILE_DESC, X509ECCKEYFILE_NAME, X509ECCKEYFILE_name, /* disablement strs */ 0, 0 }, - { /* entry idx, value */ 29, VALUE_OPT_X509ECCCERTFILE, - /* equiv idx, value */ 29, VALUE_OPT_X509ECCCERTFILE, + { /* entry idx, value */ 27, VALUE_OPT_X509ECCCERTFILE, + /* equiv idx, value */ 27, VALUE_OPT_X509ECCCERTFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509ECCCERTFILE_FLAGS, 0, @@ -1097,20 +1024,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509ECCCERTFILE_DESC, X509ECCCERTFILE_NAME, X509ECCCERTFILE_name, /* disablement strs */ 0, 0 }, - { /* entry idx, value */ 30, VALUE_OPT_PGPSUBKEY, - /* equiv idx, value */ 30, VALUE_OPT_PGPSUBKEY, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PGPSUBKEY_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --pgpsubkey */ - /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, - /* option proc */ NULL, - /* desc, NAME, name */ PGPSUBKEY_DESC, PGPSUBKEY_NAME, PGPSUBKEY_name, - /* disablement strs */ NULL, NULL }, - - { /* entry idx, value */ 31, VALUE_OPT_SRPPASSWD, - /* equiv idx, value */ 31, VALUE_OPT_SRPPASSWD, + { /* entry idx, value */ 28, VALUE_OPT_SRPPASSWD, + /* equiv idx, value */ 28, VALUE_OPT_SRPPASSWD, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SRPPASSWD_FLAGS, 0, @@ -1121,8 +1036,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SRPPASSWD_DESC, SRPPASSWD_NAME, SRPPASSWD_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 32, VALUE_OPT_SRPPASSWDCONF, - /* equiv idx, value */ 32, VALUE_OPT_SRPPASSWDCONF, + { /* entry idx, value */ 29, VALUE_OPT_SRPPASSWDCONF, + /* equiv idx, value */ 29, VALUE_OPT_SRPPASSWDCONF, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SRPPASSWDCONF_FLAGS, 0, @@ -1133,8 +1048,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SRPPASSWDCONF_DESC, SRPPASSWDCONF_NAME, SRPPASSWDCONF_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 33, VALUE_OPT_PSKPASSWD, - /* equiv idx, value */ 33, VALUE_OPT_PSKPASSWD, + { /* entry idx, value */ 30, VALUE_OPT_PSKPASSWD, + /* equiv idx, value */ 30, VALUE_OPT_PSKPASSWD, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PSKPASSWD_FLAGS, 0, @@ -1145,8 +1060,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PSKPASSWD_DESC, PSKPASSWD_NAME, PSKPASSWD_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 34, VALUE_OPT_PSKHINT, - /* equiv idx, value */ 34, VALUE_OPT_PSKHINT, + { /* entry idx, value */ 31, VALUE_OPT_PSKHINT, + /* equiv idx, value */ 31, VALUE_OPT_PSKHINT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PSKHINT_FLAGS, 0, @@ -1157,8 +1072,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PSKHINT_DESC, PSKHINT_NAME, PSKHINT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 35, VALUE_OPT_OCSP_RESPONSE, - /* equiv idx, value */ 35, VALUE_OPT_OCSP_RESPONSE, + { /* entry idx, value */ 32, VALUE_OPT_OCSP_RESPONSE, + /* equiv idx, value */ 32, VALUE_OPT_OCSP_RESPONSE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OCSP_RESPONSE_FLAGS, 0, @@ -1169,8 +1084,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ OCSP_RESPONSE_DESC, OCSP_RESPONSE_NAME, OCSP_RESPONSE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 36, VALUE_OPT_PORT, - /* equiv idx, value */ 36, VALUE_OPT_PORT, + { /* entry idx, value */ 33, VALUE_OPT_PORT, + /* equiv idx, value */ 33, VALUE_OPT_PORT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PORT_FLAGS, 0, @@ -1181,8 +1096,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PORT_DESC, PORT_NAME, PORT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 37, VALUE_OPT_LIST, - /* equiv idx, value */ 37, VALUE_OPT_LIST, + { /* entry idx, value */ 34, VALUE_OPT_LIST, + /* equiv idx, value */ 34, VALUE_OPT_LIST, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ LIST_FLAGS, 0, @@ -1193,8 +1108,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ LIST_DESC, LIST_NAME, LIST_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 38, VALUE_OPT_PROVIDER, - /* equiv idx, value */ 38, VALUE_OPT_PROVIDER, + { /* entry idx, value */ 35, VALUE_OPT_PROVIDER, + /* equiv idx, value */ 35, VALUE_OPT_PROVIDER, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PROVIDER_FLAGS, 0, @@ -1247,21 +1162,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of gnutls-serv. */ -#define zPROGNAME (gnutls_serv_opt_strs+3034) +#define zPROGNAME (gnutls_serv_opt_strs+2883) /** Reference to the title line for gnutls-serv usage. */ -#define zUsageTitle (gnutls_serv_opt_strs+3046) +#define zUsageTitle (gnutls_serv_opt_strs+2895) /** There is no gnutls-serv configuration file. */ #define zRcName NULL /** There are no directories to search for gnutls-serv config files. */ #define apzHomeList NULL /** The gnutls-serv program bug email address. */ -#define zBugsAddr (gnutls_serv_opt_strs+3132) +#define zBugsAddr (gnutls_serv_opt_strs+2981) /** Clarification/explanation of what gnutls-serv does. */ -#define zExplain (gnutls_serv_opt_strs+3152) +#define zExplain (gnutls_serv_opt_strs+3001) /** Extra detail explaining what gnutls-serv does. */ -#define zDetail (gnutls_serv_opt_strs+3154) +#define zDetail (gnutls_serv_opt_strs+3003) /** The full version string for gnutls-serv. */ -#define zFullVersion (gnutls_serv_opt_strs+3212) +#define zFullVersion (gnutls_serv_opt_strs+3061) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -1273,7 +1188,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define gnutls_serv_full_usage (NULL) -#define gnutls_serv_short_usage (gnutls_serv_opt_strs+3234) +#define gnutls_serv_short_usage (gnutls_serv_opt_strs+3083) #endif /* not defined __doxygen__ */ @@ -1443,54 +1358,6 @@ doOptPgpkeyfile(tOptions* pOptions, tOptDesc* pOptDesc) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** - * Code to handle the pgpkeyring option. - * - * @param[in] pOptions the gnutls-serv options data structure - * @param[in,out] pOptDesc the option descriptor for this option. - */ -static void -doOptPgpkeyring(tOptions* pOptions, tOptDesc* pOptDesc) -{ - static teOptFileType const type = - FTYPE_MODE_MUST_EXIST + FTYPE_MODE_NO_OPEN; - static tuFileMode mode; -#ifndef O_CLOEXEC -# define O_CLOEXEC 0 -#endif - mode.file_flags = O_CLOEXEC; - - /* - * This function handles special invalid values for "pOptions" - */ - optionFileCheck(pOptions, pOptDesc, type, mode); -} - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/** - * Code to handle the pgpcertfile option. - * - * @param[in] pOptions the gnutls-serv options data structure - * @param[in,out] pOptDesc the option descriptor for this option. - */ -static void -doOptPgpcertfile(tOptions* pOptions, tOptDesc* pOptDesc) -{ - static teOptFileType const type = - FTYPE_MODE_MUST_EXIST + FTYPE_MODE_NO_OPEN; - static tuFileMode mode; -#ifndef O_CLOEXEC -# define O_CLOEXEC 0 -#endif - mode.file_flags = O_CLOEXEC; - - /* - * This function handles special invalid values for "pOptions" - */ - optionFileCheck(pOptions, pOptDesc, type, mode); -} - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/** * Code to handle the x509dsakeyfile option. * * @param[in] pOptions the gnutls-serv options data structure @@ -1736,7 +1603,7 @@ tOptions gnutls_servOptions = { NO_EQUIVALENT, /* '-#' option index */ NO_EQUIVALENT /* index of default opt */ }, - 42 /* full option count */, 39 /* user option count */, + 39 /* full option count */, 36 /* user option count */, gnutls_serv_full_usage, gnutls_serv_short_usage, NULL, NULL, PKGDATADIR, gnutls_serv_packager_info @@ -1953,13 +1820,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.\n")); puts(_("CRL file to use")); /* referenced via gnutls_servOptions.pOptDesc->pzText */ - puts(_("PGP Key file to use")); - - /* referenced via gnutls_servOptions.pOptDesc->pzText */ - puts(_("PGP Key ring file to use")); - - /* referenced via gnutls_servOptions.pOptDesc->pzText */ - puts(_("PGP Public Key (certificate) file to use")); + puts(_("PGP Key file to use (deprecated)")); /* referenced via gnutls_servOptions.pOptDesc->pzText */ puts(_("X.509 key file or PKCS #11 URL to use")); @@ -1980,9 +1841,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.\n")); puts(_("an alias for the 'x509certfile' option (deprecated)")); /* referenced via gnutls_servOptions.pOptDesc->pzText */ - puts(_("PGP subkey to use (hex or auto)")); - - /* referenced via gnutls_servOptions.pOptDesc->pzText */ puts(_("SRP password file to use")); /* referenced via gnutls_servOptions.pOptDesc->pzText */ diff --git a/src/serv-args.h.bak b/src/serv-args.h.bak index d2ca546b91..043818aa7c 100644 --- a/src/serv-args.h.bak +++ b/src/serv-args.h.bak @@ -88,29 +88,26 @@ typedef enum { INDEX_OPT_X509CAFILE = 19, INDEX_OPT_X509CRLFILE = 20, INDEX_OPT_PGPKEYFILE = 21, - INDEX_OPT_PGPKEYRING = 22, - INDEX_OPT_PGPCERTFILE = 23, - INDEX_OPT_X509KEYFILE = 24, - INDEX_OPT_X509CERTFILE = 25, - INDEX_OPT_X509DSAKEYFILE = 26, - INDEX_OPT_X509DSACERTFILE = 27, - INDEX_OPT_X509ECCKEYFILE = 28, - INDEX_OPT_X509ECCCERTFILE = 29, - INDEX_OPT_PGPSUBKEY = 30, - INDEX_OPT_SRPPASSWD = 31, - INDEX_OPT_SRPPASSWDCONF = 32, - INDEX_OPT_PSKPASSWD = 33, - INDEX_OPT_PSKHINT = 34, - INDEX_OPT_OCSP_RESPONSE = 35, - INDEX_OPT_PORT = 36, - INDEX_OPT_LIST = 37, - INDEX_OPT_PROVIDER = 38, - INDEX_OPT_VERSION = 39, - INDEX_OPT_HELP = 40, - INDEX_OPT_MORE_HELP = 41 + INDEX_OPT_X509KEYFILE = 22, + INDEX_OPT_X509CERTFILE = 23, + INDEX_OPT_X509DSAKEYFILE = 24, + INDEX_OPT_X509DSACERTFILE = 25, + INDEX_OPT_X509ECCKEYFILE = 26, + INDEX_OPT_X509ECCCERTFILE = 27, + INDEX_OPT_SRPPASSWD = 28, + INDEX_OPT_SRPPASSWDCONF = 29, + INDEX_OPT_PSKPASSWD = 30, + INDEX_OPT_PSKHINT = 31, + INDEX_OPT_OCSP_RESPONSE = 32, + INDEX_OPT_PORT = 33, + INDEX_OPT_LIST = 34, + INDEX_OPT_PROVIDER = 35, + INDEX_OPT_VERSION = 36, + INDEX_OPT_HELP = 37, + INDEX_OPT_MORE_HELP = 38 } teOptIndex; /** count of all options for gnutls-serv */ -#define OPTION_CT 42 +#define OPTION_CT 39 /** gnutls-serv version */ #define GNUTLS_SERV_VERSION "@VERSION@" /** Full gnutls-serv version text */ @@ -191,25 +188,22 @@ typedef enum { #define VALUE_OPT_X509CAFILE 0x100D #define VALUE_OPT_X509CRLFILE 0x100E #define VALUE_OPT_PGPKEYFILE 0x100F -#define VALUE_OPT_PGPKEYRING 0x1010 -#define VALUE_OPT_PGPCERTFILE 0x1011 -#define VALUE_OPT_X509KEYFILE 0x1012 -#define VALUE_OPT_X509CERTFILE 0x1013 -#define VALUE_OPT_X509DSAKEYFILE 0x1014 -#define VALUE_OPT_X509DSACERTFILE 0x1015 -#define VALUE_OPT_X509ECCKEYFILE 0x1016 -#define VALUE_OPT_X509ECCCERTFILE 0x1017 -#define VALUE_OPT_PGPSUBKEY 0x1018 -#define VALUE_OPT_SRPPASSWD 0x1019 -#define VALUE_OPT_SRPPASSWDCONF 0x101A -#define VALUE_OPT_PSKPASSWD 0x101B -#define VALUE_OPT_PSKHINT 0x101C -#define VALUE_OPT_OCSP_RESPONSE 0x101D +#define VALUE_OPT_X509KEYFILE 0x1010 +#define VALUE_OPT_X509CERTFILE 0x1011 +#define VALUE_OPT_X509DSAKEYFILE 0x1012 +#define VALUE_OPT_X509DSACERTFILE 0x1013 +#define VALUE_OPT_X509ECCKEYFILE 0x1014 +#define VALUE_OPT_X509ECCCERTFILE 0x1015 +#define VALUE_OPT_SRPPASSWD 0x1016 +#define VALUE_OPT_SRPPASSWDCONF 0x1017 +#define VALUE_OPT_PSKPASSWD 0x1018 +#define VALUE_OPT_PSKHINT 0x1019 +#define VALUE_OPT_OCSP_RESPONSE 0x101A #define VALUE_OPT_PORT 'p' #define OPT_VALUE_PORT (DESC(PORT).optArg.argInt) #define VALUE_OPT_LIST 'l' -#define VALUE_OPT_PROVIDER 0x101E +#define VALUE_OPT_PROVIDER 0x101B /** option flag (value) for help-value option */ #define VALUE_OPT_HELP 'h' /** option flag (value) for more-help-value option */ |