summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2017-05-09 20:57:40 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-05-10 10:44:59 +0200
commit379223a5a1c418f0542a55e79acd9120e1e6a803 (patch)
tree8c916b1a7b523bcc0ffca7487c0ddf2f7ea86aeb
parentce5ea50dff8b154b35e8d73fb79b53bb4020a808 (diff)
downloadgnutls-379223a5a1c418f0542a55e79acd9120e1e6a803.tar.gz
updated auto-generated files
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Diffstat
-rw-r--r--src/certtool-args.c.bak880
-rw-r--r--src/cli-args.c.bak807
-rw-r--r--src/cli-args.h.bak178
-rw-r--r--src/cli-debug-args.c.bak66
-rw-r--r--src/danetool-args.c.bak188
5 files changed, 1076 insertions, 1043 deletions
diff --git a/src/certtool-args.c.bak b/src/certtool-args.c.bak
index c92cd375b4..31fe01ed70 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[6849] =
+static char const certtool_opt_strs[6886] =
/* 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"
@@ -124,227 +124,227 @@ static char const certtool_opt_strs[6849] =
/* 1736 */ "Verify a PEM encoded certificate chain\0"
/* 1775 */ "VERIFY_CHAIN\0"
/* 1788 */ "verify-chain\0"
-/* 1801 */ "Verify a PEM encoded certificate chain using a trusted list\0"
-/* 1861 */ "VERIFY\0"
-/* 1868 */ "verify\0"
-/* 1875 */ "Verify a CRL using a trusted list\0"
-/* 1909 */ "VERIFY_CRL\0"
-/* 1920 */ "verify-crl\0"
-/* 1931 */ "Specify a hostname to be used for certificate chain verification\0"
-/* 1996 */ "VERIFY_HOSTNAME\0"
-/* 2012 */ "verify-hostname\0"
-/* 2028 */ "Specify a email to be used for certificate chain verification\0"
-/* 2090 */ "VERIFY_EMAIL\0"
-/* 2103 */ "verify-email\0"
-/* 2116 */ "Specify a purpose OID to be used for certificate chain verification\0"
-/* 2184 */ "VERIFY_PURPOSE\0"
-/* 2199 */ "verify-purpose\0"
-/* 2214 */ "Allow broken algorithms, such as MD5 for verification\0"
-/* 2268 */ "VERIFY_ALLOW_BROKEN\0"
-/* 2288 */ "verify-allow-broken\0"
-/* 2308 */ "Generate PKCS #3 encoded Diffie-Hellman parameters\0"
-/* 2359 */ "GENERATE_DH_PARAMS\0"
-/* 2378 */ "generate-dh-params\0"
-/* 2397 */ "Get the included PKCS #3 encoded Diffie-Hellman parameters\0"
-/* 2456 */ "GET_DH_PARAMS\0"
-/* 2470 */ "get-dh-params\0"
-/* 2484 */ "Print information PKCS #3 encoded Diffie-Hellman parameters\0"
-/* 2544 */ "DH_INFO\0"
-/* 2552 */ "dh-info\0"
-/* 2560 */ "Loads a private key file\0"
-/* 2585 */ "LOAD_PRIVKEY\0"
-/* 2598 */ "load-privkey\0"
-/* 2611 */ "Loads a public key file\0"
-/* 2635 */ "LOAD_PUBKEY\0"
-/* 2647 */ "load-pubkey\0"
-/* 2659 */ "Loads a certificate request file\0"
-/* 2692 */ "LOAD_REQUEST\0"
-/* 2705 */ "load-request\0"
-/* 2718 */ "Loads a certificate file\0"
-/* 2743 */ "LOAD_CERTIFICATE\0"
-/* 2760 */ "load-certificate\0"
-/* 2777 */ "Loads the certificate authority's private key file\0"
-/* 2828 */ "LOAD_CA_PRIVKEY\0"
-/* 2844 */ "load-ca-privkey\0"
-/* 2860 */ "Loads the certificate authority's certificate file\0"
-/* 2911 */ "LOAD_CA_CERTIFICATE\0"
-/* 2931 */ "load-ca-certificate\0"
-/* 2951 */ "Loads the provided CRL\0"
-/* 2974 */ "LOAD_CRL\0"
-/* 2983 */ "load-crl\0"
-/* 2992 */ "Loads auxiliary data\0"
-/* 3013 */ "LOAD_DATA\0"
-/* 3023 */ "load-data\0"
-/* 3033 */ "Password to use\0"
-/* 3049 */ "PASSWORD\0"
-/* 3058 */ "password\0"
-/* 3067 */ "Enforce a NULL password\0"
-/* 3091 */ "NULL_PASSWORD\0"
-/* 3105 */ "null-password\0"
-/* 3119 */ "Enforce an empty password\0"
-/* 3145 */ "EMPTY_PASSWORD\0"
-/* 3160 */ "empty-password\0"
-/* 3175 */ "Print big number in an easier format to parse\0"
-/* 3221 */ "HEX_NUMBERS\0"
-/* 3233 */ "hex-numbers\0"
-/* 3245 */ "In certain operations it prints the information in C-friendly format\0"
-/* 3314 */ "CPRINT\0"
-/* 3321 */ "cprint\0"
-/* 3328 */ "Print information on the given certificate\0"
-/* 3371 */ "CERTIFICATE_INFO\0"
-/* 3388 */ "certificate-info\0"
-/* 3405 */ "Print the fingerprint of the given certificate\0"
-/* 3452 */ "FINGERPRINT\0"
-/* 3464 */ "fingerprint\0"
-/* 3476 */ "Print the key ID of the given certificate\0"
-/* 3518 */ "KEY_ID\0"
-/* 3525 */ "key-id\0"
-/* 3532 */ "Print certificate's public key\0"
-/* 3563 */ "CERTIFICATE_PUBKEY\0"
-/* 3582 */ "certificate-pubkey\0"
-/* 3601 */ "Print information on the given OpenPGP certificate\0"
-/* 3652 */ "PGP_CERTIFICATE_INFO\0"
-/* 3673 */ "pgp-certificate-info\0"
-/* 3694 */ "Print information on the given OpenPGP keyring structure\0"
-/* 3751 */ "PGP_RING_INFO\0"
-/* 3765 */ "pgp-ring-info\0"
-/* 3779 */ "Print information on the given CRL structure\0"
-/* 3824 */ "CRL_INFO\0"
-/* 3833 */ "crl-info\0"
-/* 3842 */ "Print information on the given certificate request\0"
-/* 3893 */ "CRQ_INFO\0"
-/* 3902 */ "crq-info\0"
-/* 3911 */ "Do not use extensions in certificate requests\0"
-/* 3957 */ "NO_CRQ_EXTENSIONS\0"
-/* 3975 */ "no-crq-extensions\0"
-/* 3993 */ "Print information on a PKCS #12 structure\0"
-/* 4035 */ "P12_INFO\0"
-/* 4044 */ "p12-info\0"
-/* 4053 */ "The PKCS #12 friendly name to use\0"
-/* 4087 */ "P12_NAME\0"
-/* 4096 */ "p12-name\0"
-/* 4105 */ "Generate a PKCS #7 structure\0"
-/* 4134 */ "P7_GENERATE\0"
-/* 4146 */ "p7-generate\0"
-/* 4158 */ "Signs using a PKCS #7 structure\0"
-/* 4190 */ "P7_SIGN\0"
-/* 4198 */ "p7-sign\0"
-/* 4206 */ "Signs using a detached PKCS #7 structure\0"
-/* 4247 */ "P7_DETACHED_SIGN\0"
-/* 4264 */ "p7-detached-sign\0"
-/* 4281 */ "The signer's certificate will be included in the cert list.\0"
-/* 4341 */ "P7_INCLUDE_CERT\0"
-/* 4357 */ "no-p7-include-cert\0"
-/* 4376 */ "no\0"
-/* 4379 */ "Will include a timestamp in the PKCS #7 structure\0"
-/* 4429 */ "P7_TIME\0"
-/* 4437 */ "no-p7-time\0"
-/* 4448 */ "Will show the embedded data in the PKCS #7 structure\0"
-/* 4501 */ "P7_SHOW_DATA\0"
-/* 4514 */ "no-p7-show-data\0"
-/* 4530 */ "Print information on a PKCS #7 structure\0"
-/* 4571 */ "P7_INFO\0"
-/* 4579 */ "p7-info\0"
-/* 4587 */ "Verify the provided PKCS #7 structure\0"
-/* 4625 */ "P7_VERIFY\0"
-/* 4635 */ "p7-verify\0"
-/* 4645 */ "Print information on a PKCS #8 structure\0"
-/* 4686 */ "P8_INFO\0"
-/* 4694 */ "p8-info\0"
-/* 4702 */ "Convert S/MIME to PKCS #7 structure\0"
-/* 4738 */ "SMIME_TO_P7\0"
-/* 4750 */ "smime-to-p7\0"
-/* 4762 */ "Print information on a private key\0"
-/* 4797 */ "KEY_INFO\0"
-/* 4806 */ "key-info\0"
-/* 4815 */ "Print information on an OpenPGP private key\0"
-/* 4859 */ "PGP_KEY_INFO\0"
-/* 4872 */ "pgp-key-info\0"
-/* 4885 */ "Print information on a public key\0"
-/* 4919 */ "PUBKEY_INFO\0"
-/* 4931 */ "pubkey-info\0"
-/* 4943 */ "Generate an X.509 version 1 certificate (with no extensions)\0"
-/* 5004 */ "V1\0"
-/* 5007 */ "v1\0"
-/* 5010 */ "Generate a PKCS #12 structure\0"
-/* 5040 */ "TO_P12\0"
-/* 5047 */ "to-p12\0"
-/* 5054 */ "Generate a PKCS #8 structure\0"
-/* 5083 */ "TO_P8\0"
-/* 5089 */ "to-p8\0"
-/* 5095 */ "Use PKCS #8 format for private keys\0"
-/* 5131 */ "PKCS8\0"
-/* 5137 */ "pkcs8\0"
-/* 5143 */ "Generate RSA key\0"
-/* 5160 */ "RSA\0"
-/* 5164 */ "rsa\0"
-/* 5168 */ "Generate DSA key\0"
-/* 5185 */ "DSA\0"
-/* 5189 */ "dsa\0"
-/* 5193 */ "Generate ECC (ECDSA) key\0"
-/* 5218 */ "ECC\0"
-/* 5222 */ "ecc\0"
-/* 5226 */ "an alias for the 'ecc' option\0"
-/* 5256 */ "ecdsa\0"
-/* 5262 */ "Hash algorithm to use for signing\0"
-/* 5296 */ "HASH\0"
-/* 5301 */ "hash\0"
-/* 5306 */ "Use DER format for input certificates, private keys, and DH parameters\0"
-/* 5377 */ "INDER\0"
-/* 5383 */ "no-inder\0"
-/* 5392 */ "an alias for the 'inder' option\0"
-/* 5424 */ "inraw\0"
-/* 5430 */ "Use DER format for output certificates, private keys, and DH parameters\0"
-/* 5502 */ "OUTDER\0"
-/* 5509 */ "no-outder\0"
-/* 5519 */ "an alias for the 'outder' option\0"
-/* 5552 */ "outraw\0"
-/* 5559 */ "Specify the number of bits for key generate\0"
-/* 5603 */ "BITS\0"
-/* 5608 */ "bits\0"
-/* 5613 */ "Specify the curve used for EC key generation\0"
-/* 5658 */ "CURVE\0"
-/* 5664 */ "curve\0"
-/* 5670 */ "Specify the security level [low, legacy, medium, high, ultra]\0"
-/* 5732 */ "SEC_PARAM\0"
-/* 5742 */ "sec-param\0"
-/* 5752 */ "No effect\0"
-/* 5762 */ "DISABLE_QUICK_RANDOM\0"
-/* 5783 */ "disable-quick-random\0"
-/* 5804 */ "Template file to use for non-interactive operation\0"
-/* 5855 */ "TEMPLATE\0"
-/* 5864 */ "template\0"
-/* 5873 */ "Print information to stdout instead of stderr\0"
-/* 5919 */ "STDOUT_INFO\0"
-/* 5931 */ "stdout-info\0"
-/* 5943 */ "Enable interaction for entering password when in batch mode.\0"
-/* 6004 */ "ASK_PASS\0"
-/* 6013 */ "ask-pass\0"
-/* 6022 */ "Cipher to use for PKCS #8 and #12 operations\0"
-/* 6067 */ "PKCS_CIPHER\0"
-/* 6079 */ "pkcs-cipher\0"
-/* 6091 */ "Specify the PKCS #11 provider library\0"
-/* 6129 */ "PROVIDER\0"
-/* 6138 */ "provider\0"
-/* 6147 */ "display extended usage information and exit\0"
-/* 6191 */ "help\0"
-/* 6196 */ "extended usage information passed thru pager\0"
-/* 6241 */ "more-help\0"
-/* 6251 */ "output version information and exit\0"
-/* 6287 */ "version\0"
-/* 6295 */ "CERTTOOL\0"
-/* 6304 */ "certtool - GnuTLS certificate tool\n"
+/* 1801 */ "Verify a PEM encoded certificate (chain) against a trusted set\0"
+/* 1864 */ "VERIFY\0"
+/* 1871 */ "verify\0"
+/* 1878 */ "Verify a Certificate Revocation List using a trusted list\0"
+/* 1936 */ "VERIFY_CRL\0"
+/* 1947 */ "verify-crl\0"
+/* 1958 */ "Specify a hostname to be used for certificate chain verification\0"
+/* 2023 */ "VERIFY_HOSTNAME\0"
+/* 2039 */ "verify-hostname\0"
+/* 2055 */ "Specify a email to be used for certificate chain verification\0"
+/* 2117 */ "VERIFY_EMAIL\0"
+/* 2130 */ "verify-email\0"
+/* 2143 */ "Specify a purpose OID to be used for certificate chain verification\0"
+/* 2211 */ "VERIFY_PURPOSE\0"
+/* 2226 */ "verify-purpose\0"
+/* 2241 */ "Allow broken algorithms, such as MD5 for verification\0"
+/* 2295 */ "VERIFY_ALLOW_BROKEN\0"
+/* 2315 */ "verify-allow-broken\0"
+/* 2335 */ "Generate PKCS #3 encoded Diffie-Hellman parameters\0"
+/* 2386 */ "GENERATE_DH_PARAMS\0"
+/* 2405 */ "generate-dh-params\0"
+/* 2424 */ "Get the included PKCS #3 encoded Diffie-Hellman parameters\0"
+/* 2483 */ "GET_DH_PARAMS\0"
+/* 2497 */ "get-dh-params\0"
+/* 2511 */ "Print information PKCS #3 encoded Diffie-Hellman parameters\0"
+/* 2571 */ "DH_INFO\0"
+/* 2579 */ "dh-info\0"
+/* 2587 */ "Loads a private key file\0"
+/* 2612 */ "LOAD_PRIVKEY\0"
+/* 2625 */ "load-privkey\0"
+/* 2638 */ "Loads a public key file\0"
+/* 2662 */ "LOAD_PUBKEY\0"
+/* 2674 */ "load-pubkey\0"
+/* 2686 */ "Loads a certificate request file\0"
+/* 2719 */ "LOAD_REQUEST\0"
+/* 2732 */ "load-request\0"
+/* 2745 */ "Loads a certificate file\0"
+/* 2770 */ "LOAD_CERTIFICATE\0"
+/* 2787 */ "load-certificate\0"
+/* 2804 */ "Loads the certificate authority's private key file\0"
+/* 2855 */ "LOAD_CA_PRIVKEY\0"
+/* 2871 */ "load-ca-privkey\0"
+/* 2887 */ "Loads the certificate authority's certificate file\0"
+/* 2938 */ "LOAD_CA_CERTIFICATE\0"
+/* 2958 */ "load-ca-certificate\0"
+/* 2978 */ "Loads the provided CRL\0"
+/* 3001 */ "LOAD_CRL\0"
+/* 3010 */ "load-crl\0"
+/* 3019 */ "Loads auxiliary data\0"
+/* 3040 */ "LOAD_DATA\0"
+/* 3050 */ "load-data\0"
+/* 3060 */ "Password to use\0"
+/* 3076 */ "PASSWORD\0"
+/* 3085 */ "password\0"
+/* 3094 */ "Enforce a NULL password\0"
+/* 3118 */ "NULL_PASSWORD\0"
+/* 3132 */ "null-password\0"
+/* 3146 */ "Enforce an empty password\0"
+/* 3172 */ "EMPTY_PASSWORD\0"
+/* 3187 */ "empty-password\0"
+/* 3202 */ "Print big number in an easier format to parse\0"
+/* 3248 */ "HEX_NUMBERS\0"
+/* 3260 */ "hex-numbers\0"
+/* 3272 */ "In certain operations it prints the information in C-friendly format\0"
+/* 3341 */ "CPRINT\0"
+/* 3348 */ "cprint\0"
+/* 3355 */ "Print information on the given certificate\0"
+/* 3398 */ "CERTIFICATE_INFO\0"
+/* 3415 */ "certificate-info\0"
+/* 3432 */ "Print the fingerprint of the given certificate\0"
+/* 3479 */ "FINGERPRINT\0"
+/* 3491 */ "fingerprint\0"
+/* 3503 */ "Print the key ID of the given certificate\0"
+/* 3545 */ "KEY_ID\0"
+/* 3552 */ "key-id\0"
+/* 3559 */ "Print certificate's public key\0"
+/* 3590 */ "CERTIFICATE_PUBKEY\0"
+/* 3609 */ "certificate-pubkey\0"
+/* 3628 */ "Print information on the given OpenPGP certificate\0"
+/* 3679 */ "PGP_CERTIFICATE_INFO\0"
+/* 3700 */ "pgp-certificate-info\0"
+/* 3721 */ "Print information on the given OpenPGP keyring structure\0"
+/* 3778 */ "PGP_RING_INFO\0"
+/* 3792 */ "pgp-ring-info\0"
+/* 3806 */ "Print information on the given CRL structure\0"
+/* 3851 */ "CRL_INFO\0"
+/* 3860 */ "crl-info\0"
+/* 3869 */ "Print information on the given certificate request\0"
+/* 3920 */ "CRQ_INFO\0"
+/* 3929 */ "crq-info\0"
+/* 3938 */ "Do not use extensions in certificate requests\0"
+/* 3984 */ "NO_CRQ_EXTENSIONS\0"
+/* 4002 */ "no-crq-extensions\0"
+/* 4020 */ "Print information on a PKCS #12 structure\0"
+/* 4062 */ "P12_INFO\0"
+/* 4071 */ "p12-info\0"
+/* 4080 */ "The PKCS #12 friendly name to use\0"
+/* 4114 */ "P12_NAME\0"
+/* 4123 */ "p12-name\0"
+/* 4132 */ "Generate a PKCS #7 structure\0"
+/* 4161 */ "P7_GENERATE\0"
+/* 4173 */ "p7-generate\0"
+/* 4185 */ "Signs using a PKCS #7 structure\0"
+/* 4217 */ "P7_SIGN\0"
+/* 4225 */ "p7-sign\0"
+/* 4233 */ "Signs using a detached PKCS #7 structure\0"
+/* 4274 */ "P7_DETACHED_SIGN\0"
+/* 4291 */ "p7-detached-sign\0"
+/* 4308 */ "The signer's certificate will be included in the cert list.\0"
+/* 4368 */ "P7_INCLUDE_CERT\0"
+/* 4384 */ "no-p7-include-cert\0"
+/* 4403 */ "no\0"
+/* 4406 */ "Will include a timestamp in the PKCS #7 structure\0"
+/* 4456 */ "P7_TIME\0"
+/* 4464 */ "no-p7-time\0"
+/* 4475 */ "Will show the embedded data in the PKCS #7 structure\0"
+/* 4528 */ "P7_SHOW_DATA\0"
+/* 4541 */ "no-p7-show-data\0"
+/* 4557 */ "Print information on a PKCS #7 structure\0"
+/* 4598 */ "P7_INFO\0"
+/* 4606 */ "p7-info\0"
+/* 4614 */ "Verify the provided PKCS #7 structure\0"
+/* 4652 */ "P7_VERIFY\0"
+/* 4662 */ "p7-verify\0"
+/* 4672 */ "Print information on a PKCS #8 structure\0"
+/* 4713 */ "P8_INFO\0"
+/* 4721 */ "p8-info\0"
+/* 4729 */ "Convert S/MIME to PKCS #7 structure\0"
+/* 4765 */ "SMIME_TO_P7\0"
+/* 4777 */ "smime-to-p7\0"
+/* 4789 */ "Print information on a private key\0"
+/* 4824 */ "KEY_INFO\0"
+/* 4833 */ "key-info\0"
+/* 4842 */ "Print information on an OpenPGP private key\0"
+/* 4886 */ "PGP_KEY_INFO\0"
+/* 4899 */ "pgp-key-info\0"
+/* 4912 */ "Print information on a public key\0"
+/* 4946 */ "PUBKEY_INFO\0"
+/* 4958 */ "pubkey-info\0"
+/* 4970 */ "Generate an X.509 version 1 certificate (with no extensions)\0"
+/* 5031 */ "V1\0"
+/* 5034 */ "v1\0"
+/* 5037 */ "Generate a PKCS #12 structure\0"
+/* 5067 */ "TO_P12\0"
+/* 5074 */ "to-p12\0"
+/* 5081 */ "Generate a PKCS #8 structure\0"
+/* 5110 */ "TO_P8\0"
+/* 5116 */ "to-p8\0"
+/* 5122 */ "Use PKCS #8 format for private keys\0"
+/* 5158 */ "PKCS8\0"
+/* 5164 */ "pkcs8\0"
+/* 5170 */ "Generate RSA key\0"
+/* 5187 */ "RSA\0"
+/* 5191 */ "rsa\0"
+/* 5195 */ "Generate DSA key\0"
+/* 5212 */ "DSA\0"
+/* 5216 */ "dsa\0"
+/* 5220 */ "Generate ECC (ECDSA) key\0"
+/* 5245 */ "ECC\0"
+/* 5249 */ "ecc\0"
+/* 5253 */ "an alias for the 'ecc' option\0"
+/* 5283 */ "ecdsa\0"
+/* 5289 */ "Hash algorithm to use for signing\0"
+/* 5323 */ "HASH\0"
+/* 5328 */ "hash\0"
+/* 5333 */ "Use DER format for input certificates, private keys, and DH parameters\0"
+/* 5404 */ "INDER\0"
+/* 5410 */ "no-inder\0"
+/* 5419 */ "an alias for the 'inder' option\0"
+/* 5451 */ "inraw\0"
+/* 5457 */ "Use DER format for output certificates, private keys, and DH parameters\0"
+/* 5529 */ "OUTDER\0"
+/* 5536 */ "no-outder\0"
+/* 5546 */ "an alias for the 'outder' option\0"
+/* 5579 */ "outraw\0"
+/* 5586 */ "Specify the number of bits for key generate\0"
+/* 5630 */ "BITS\0"
+/* 5635 */ "bits\0"
+/* 5640 */ "Specify the curve used for EC key generation\0"
+/* 5685 */ "CURVE\0"
+/* 5691 */ "curve\0"
+/* 5697 */ "Specify the security level [low, legacy, medium, high, ultra]\0"
+/* 5759 */ "SEC_PARAM\0"
+/* 5769 */ "sec-param\0"
+/* 5779 */ "No effect\0"
+/* 5789 */ "DISABLE_QUICK_RANDOM\0"
+/* 5810 */ "disable-quick-random\0"
+/* 5831 */ "Template file to use for non-interactive operation\0"
+/* 5882 */ "TEMPLATE\0"
+/* 5891 */ "template\0"
+/* 5900 */ "Print information to stdout instead of stderr\0"
+/* 5946 */ "STDOUT_INFO\0"
+/* 5958 */ "stdout-info\0"
+/* 5970 */ "Enable interaction for entering password when in batch mode.\0"
+/* 6031 */ "ASK_PASS\0"
+/* 6040 */ "ask-pass\0"
+/* 6049 */ "Cipher to use for PKCS #8 and #12 operations\0"
+/* 6094 */ "PKCS_CIPHER\0"
+/* 6106 */ "pkcs-cipher\0"
+/* 6118 */ "Specify the PKCS #11 provider library\0"
+/* 6156 */ "PROVIDER\0"
+/* 6165 */ "provider\0"
+/* 6174 */ "display extended usage information and exit\0"
+/* 6218 */ "help\0"
+/* 6223 */ "extended usage information passed thru pager\0"
+/* 6268 */ "more-help\0"
+/* 6278 */ "output version information and exit\0"
+/* 6314 */ "version\0"
+/* 6322 */ "CERTTOOL\0"
+/* 6331 */ "certtool - GnuTLS certificate tool\n"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
-/* 6397 */ "@PACKAGE_BUGREPORT@\0"
-/* 6417 */ "\n\0"
-/* 6419 */ "Tool to parse and generate X.509 certificates, requests and private keys.\n"
+/* 6424 */ "@PACKAGE_BUGREPORT@\0"
+/* 6444 */ "\n\0"
+/* 6446 */ "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 URLs supported by GnuTLS. In case PIN is\n"
- "required for the URL access you can provide it using the environment\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"
-/* 6770 */ "certtool @VERSION@\0"
-/* 6789 */ "certtool [options]\n"
+/* 6807 */ "certtool @VERSION@\0"
+/* 6826 */ "certtool [options]\n"
"certtool --help for usage instructions.\n";
/**
@@ -541,9 +541,9 @@ static int const aGenerate_RequestCantList[] = {
/** Descriptive text for the verify option */
#define VERIFY_DESC (certtool_opt_strs+1801)
/** Upper-cased name for the verify option */
-#define VERIFY_NAME (certtool_opt_strs+1861)
+#define VERIFY_NAME (certtool_opt_strs+1864)
/** Name string for the verify option */
-#define VERIFY_name (certtool_opt_strs+1868)
+#define VERIFY_name (certtool_opt_strs+1871)
/** Compiled in flag settings for the verify option */
#define VERIFY_FLAGS (OPTST_DISABLED)
@@ -552,11 +552,11 @@ static int const aGenerate_RequestCantList[] = {
* "Must also have options" and "Incompatible options":
*/
/** Descriptive text for the verify-crl option */
-#define VERIFY_CRL_DESC (certtool_opt_strs+1875)
+#define VERIFY_CRL_DESC (certtool_opt_strs+1878)
/** Upper-cased name for the verify-crl option */
-#define VERIFY_CRL_NAME (certtool_opt_strs+1909)
+#define VERIFY_CRL_NAME (certtool_opt_strs+1936)
/** Name string for the verify-crl option */
-#define VERIFY_CRL_name (certtool_opt_strs+1920)
+#define VERIFY_CRL_name (certtool_opt_strs+1947)
/** Other options that are required by the verify-crl option */
static int const aVerify_CrlMustList[] = {
INDEX_OPT_LOAD_CA_CERTIFICATE, NO_EQUIVALENT };
@@ -567,11 +567,11 @@ static int const aVerify_CrlMustList[] = {
* verify-hostname option description:
*/
/** Descriptive text for the verify-hostname option */
-#define VERIFY_HOSTNAME_DESC (certtool_opt_strs+1931)
+#define VERIFY_HOSTNAME_DESC (certtool_opt_strs+1958)
/** Upper-cased name for the verify-hostname option */
-#define VERIFY_HOSTNAME_NAME (certtool_opt_strs+1996)
+#define VERIFY_HOSTNAME_NAME (certtool_opt_strs+2023)
/** Name string for the verify-hostname option */
-#define VERIFY_HOSTNAME_name (certtool_opt_strs+2012)
+#define VERIFY_HOSTNAME_name (certtool_opt_strs+2039)
/** Compiled in flag settings for the verify-hostname option */
#define VERIFY_HOSTNAME_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -581,11 +581,11 @@ static int const aVerify_CrlMustList[] = {
* "Must also have options" and "Incompatible options":
*/
/** Descriptive text for the verify-email option */
-#define VERIFY_EMAIL_DESC (certtool_opt_strs+2028)
+#define VERIFY_EMAIL_DESC (certtool_opt_strs+2055)
/** Upper-cased name for the verify-email option */
-#define VERIFY_EMAIL_NAME (certtool_opt_strs+2090)
+#define VERIFY_EMAIL_NAME (certtool_opt_strs+2117)
/** Name string for the verify-email option */
-#define VERIFY_EMAIL_name (certtool_opt_strs+2103)
+#define VERIFY_EMAIL_name (certtool_opt_strs+2130)
/** Other options that appear in conjunction with the verify-email option */
static int const aVerify_EmailCantList[] = {
INDEX_OPT_VERIFY_HOSTNAME, NO_EQUIVALENT };
@@ -597,11 +597,11 @@ static int const aVerify_EmailCantList[] = {
* verify-purpose option description:
*/
/** Descriptive text for the verify-purpose option */
-#define VERIFY_PURPOSE_DESC (certtool_opt_strs+2116)
+#define VERIFY_PURPOSE_DESC (certtool_opt_strs+2143)
/** Upper-cased name for the verify-purpose option */
-#define VERIFY_PURPOSE_NAME (certtool_opt_strs+2184)
+#define VERIFY_PURPOSE_NAME (certtool_opt_strs+2211)
/** Name string for the verify-purpose option */
-#define VERIFY_PURPOSE_name (certtool_opt_strs+2199)
+#define VERIFY_PURPOSE_name (certtool_opt_strs+2226)
/** Compiled in flag settings for the verify-purpose option */
#define VERIFY_PURPOSE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -610,11 +610,11 @@ static int const aVerify_EmailCantList[] = {
* verify-allow-broken option description:
*/
/** Descriptive text for the verify-allow-broken option */
-#define VERIFY_ALLOW_BROKEN_DESC (certtool_opt_strs+2214)
+#define VERIFY_ALLOW_BROKEN_DESC (certtool_opt_strs+2241)
/** Upper-cased name for the verify-allow-broken option */
-#define VERIFY_ALLOW_BROKEN_NAME (certtool_opt_strs+2268)
+#define VERIFY_ALLOW_BROKEN_NAME (certtool_opt_strs+2295)
/** Name string for the verify-allow-broken option */
-#define VERIFY_ALLOW_BROKEN_name (certtool_opt_strs+2288)
+#define VERIFY_ALLOW_BROKEN_name (certtool_opt_strs+2315)
/** Compiled in flag settings for the verify-allow-broken option */
#define VERIFY_ALLOW_BROKEN_FLAGS (OPTST_DISABLED)
@@ -622,11 +622,11 @@ static int const aVerify_EmailCantList[] = {
* generate-dh-params option description:
*/
/** Descriptive text for the generate-dh-params option */
-#define GENERATE_DH_PARAMS_DESC (certtool_opt_strs+2308)
+#define GENERATE_DH_PARAMS_DESC (certtool_opt_strs+2335)
/** Upper-cased name for the generate-dh-params option */
-#define GENERATE_DH_PARAMS_NAME (certtool_opt_strs+2359)
+#define GENERATE_DH_PARAMS_NAME (certtool_opt_strs+2386)
/** Name string for the generate-dh-params option */
-#define GENERATE_DH_PARAMS_name (certtool_opt_strs+2378)
+#define GENERATE_DH_PARAMS_name (certtool_opt_strs+2405)
/** Compiled in flag settings for the generate-dh-params option */
#define GENERATE_DH_PARAMS_FLAGS (OPTST_DISABLED)
@@ -634,11 +634,11 @@ static int const aVerify_EmailCantList[] = {
* get-dh-params option description:
*/
/** Descriptive text for the get-dh-params option */
-#define GET_DH_PARAMS_DESC (certtool_opt_strs+2397)
+#define GET_DH_PARAMS_DESC (certtool_opt_strs+2424)
/** Upper-cased name for the get-dh-params option */
-#define GET_DH_PARAMS_NAME (certtool_opt_strs+2456)
+#define GET_DH_PARAMS_NAME (certtool_opt_strs+2483)
/** Name string for the get-dh-params option */
-#define GET_DH_PARAMS_name (certtool_opt_strs+2470)
+#define GET_DH_PARAMS_name (certtool_opt_strs+2497)
/** Compiled in flag settings for the get-dh-params option */
#define GET_DH_PARAMS_FLAGS (OPTST_DISABLED)
@@ -646,11 +646,11 @@ static int const aVerify_EmailCantList[] = {
* dh-info option description:
*/
/** Descriptive text for the dh-info option */
-#define DH_INFO_DESC (certtool_opt_strs+2484)
+#define DH_INFO_DESC (certtool_opt_strs+2511)
/** Upper-cased name for the dh-info option */
-#define DH_INFO_NAME (certtool_opt_strs+2544)
+#define DH_INFO_NAME (certtool_opt_strs+2571)
/** Name string for the dh-info option */
-#define DH_INFO_name (certtool_opt_strs+2552)
+#define DH_INFO_name (certtool_opt_strs+2579)
/** Compiled in flag settings for the dh-info option */
#define DH_INFO_FLAGS (OPTST_DISABLED)
@@ -658,11 +658,11 @@ static int const aVerify_EmailCantList[] = {
* load-privkey option description:
*/
/** Descriptive text for the load-privkey option */
-#define LOAD_PRIVKEY_DESC (certtool_opt_strs+2560)
+#define LOAD_PRIVKEY_DESC (certtool_opt_strs+2587)
/** Upper-cased name for the load-privkey option */
-#define LOAD_PRIVKEY_NAME (certtool_opt_strs+2585)
+#define LOAD_PRIVKEY_NAME (certtool_opt_strs+2612)
/** Name string for the load-privkey option */
-#define LOAD_PRIVKEY_name (certtool_opt_strs+2598)
+#define LOAD_PRIVKEY_name (certtool_opt_strs+2625)
/** Compiled in flag settings for the load-privkey option */
#define LOAD_PRIVKEY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -671,11 +671,11 @@ static int const aVerify_EmailCantList[] = {
* load-pubkey option description:
*/
/** Descriptive text for the load-pubkey option */
-#define LOAD_PUBKEY_DESC (certtool_opt_strs+2611)
+#define LOAD_PUBKEY_DESC (certtool_opt_strs+2638)
/** Upper-cased name for the load-pubkey option */
-#define LOAD_PUBKEY_NAME (certtool_opt_strs+2635)
+#define LOAD_PUBKEY_NAME (certtool_opt_strs+2662)
/** Name string for the load-pubkey option */
-#define LOAD_PUBKEY_name (certtool_opt_strs+2647)
+#define LOAD_PUBKEY_name (certtool_opt_strs+2674)
/** Compiled in flag settings for the load-pubkey option */
#define LOAD_PUBKEY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -684,11 +684,11 @@ static int const aVerify_EmailCantList[] = {
* load-request option description:
*/
/** Descriptive text for the load-request option */
-#define LOAD_REQUEST_DESC (certtool_opt_strs+2659)
+#define LOAD_REQUEST_DESC (certtool_opt_strs+2686)
/** Upper-cased name for the load-request option */
-#define LOAD_REQUEST_NAME (certtool_opt_strs+2692)
+#define LOAD_REQUEST_NAME (certtool_opt_strs+2719)
/** Name string for the load-request option */
-#define LOAD_REQUEST_name (certtool_opt_strs+2705)
+#define LOAD_REQUEST_name (certtool_opt_strs+2732)
/** Compiled in flag settings for the load-request option */
#define LOAD_REQUEST_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -697,11 +697,11 @@ static int const aVerify_EmailCantList[] = {
* load-certificate option description:
*/
/** Descriptive text for the load-certificate option */
-#define LOAD_CERTIFICATE_DESC (certtool_opt_strs+2718)
+#define LOAD_CERTIFICATE_DESC (certtool_opt_strs+2745)
/** Upper-cased name for the load-certificate option */
-#define LOAD_CERTIFICATE_NAME (certtool_opt_strs+2743)
+#define LOAD_CERTIFICATE_NAME (certtool_opt_strs+2770)
/** Name string for the load-certificate option */
-#define LOAD_CERTIFICATE_name (certtool_opt_strs+2760)
+#define LOAD_CERTIFICATE_name (certtool_opt_strs+2787)
/** Compiled in flag settings for the load-certificate option */
#define LOAD_CERTIFICATE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -710,11 +710,11 @@ static int const aVerify_EmailCantList[] = {
* load-ca-privkey option description:
*/
/** Descriptive text for the load-ca-privkey option */
-#define LOAD_CA_PRIVKEY_DESC (certtool_opt_strs+2777)
+#define LOAD_CA_PRIVKEY_DESC (certtool_opt_strs+2804)
/** Upper-cased name for the load-ca-privkey option */
-#define LOAD_CA_PRIVKEY_NAME (certtool_opt_strs+2828)
+#define LOAD_CA_PRIVKEY_NAME (certtool_opt_strs+2855)
/** Name string for the load-ca-privkey option */
-#define LOAD_CA_PRIVKEY_name (certtool_opt_strs+2844)
+#define LOAD_CA_PRIVKEY_name (certtool_opt_strs+2871)
/** Compiled in flag settings for the load-ca-privkey option */
#define LOAD_CA_PRIVKEY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -723,11 +723,11 @@ static int const aVerify_EmailCantList[] = {
* load-ca-certificate option description:
*/
/** Descriptive text for the load-ca-certificate option */
-#define LOAD_CA_CERTIFICATE_DESC (certtool_opt_strs+2860)
+#define LOAD_CA_CERTIFICATE_DESC (certtool_opt_strs+2887)
/** Upper-cased name for the load-ca-certificate option */
-#define LOAD_CA_CERTIFICATE_NAME (certtool_opt_strs+2911)
+#define LOAD_CA_CERTIFICATE_NAME (certtool_opt_strs+2938)
/** Name string for the load-ca-certificate option */
-#define LOAD_CA_CERTIFICATE_name (certtool_opt_strs+2931)
+#define LOAD_CA_CERTIFICATE_name (certtool_opt_strs+2958)
/** Compiled in flag settings for the load-ca-certificate option */
#define LOAD_CA_CERTIFICATE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -736,11 +736,11 @@ static int const aVerify_EmailCantList[] = {
* load-crl option description:
*/
/** Descriptive text for the load-crl option */
-#define LOAD_CRL_DESC (certtool_opt_strs+2951)
+#define LOAD_CRL_DESC (certtool_opt_strs+2978)
/** Upper-cased name for the load-crl option */
-#define LOAD_CRL_NAME (certtool_opt_strs+2974)
+#define LOAD_CRL_NAME (certtool_opt_strs+3001)
/** Name string for the load-crl option */
-#define LOAD_CRL_name (certtool_opt_strs+2983)
+#define LOAD_CRL_name (certtool_opt_strs+3010)
/** Compiled in flag settings for the load-crl option */
#define LOAD_CRL_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -749,11 +749,11 @@ static int const aVerify_EmailCantList[] = {
* load-data option description:
*/
/** Descriptive text for the load-data option */
-#define LOAD_DATA_DESC (certtool_opt_strs+2992)
+#define LOAD_DATA_DESC (certtool_opt_strs+3019)
/** Upper-cased name for the load-data option */
-#define LOAD_DATA_NAME (certtool_opt_strs+3013)
+#define LOAD_DATA_NAME (certtool_opt_strs+3040)
/** Name string for the load-data option */
-#define LOAD_DATA_name (certtool_opt_strs+3023)
+#define LOAD_DATA_name (certtool_opt_strs+3050)
/** Compiled in flag settings for the load-data option */
#define LOAD_DATA_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -762,11 +762,11 @@ static int const aVerify_EmailCantList[] = {
* password option description:
*/
/** Descriptive text for the password option */
-#define PASSWORD_DESC (certtool_opt_strs+3033)
+#define PASSWORD_DESC (certtool_opt_strs+3060)
/** Upper-cased name for the password option */
-#define PASSWORD_NAME (certtool_opt_strs+3049)
+#define PASSWORD_NAME (certtool_opt_strs+3076)
/** Name string for the password option */
-#define PASSWORD_name (certtool_opt_strs+3058)
+#define PASSWORD_name (certtool_opt_strs+3085)
/** Compiled in flag settings for the password option */
#define PASSWORD_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -775,11 +775,11 @@ static int const aVerify_EmailCantList[] = {
* null-password option description:
*/
/** Descriptive text for the null-password option */
-#define NULL_PASSWORD_DESC (certtool_opt_strs+3067)
+#define NULL_PASSWORD_DESC (certtool_opt_strs+3094)
/** Upper-cased name for the null-password option */
-#define NULL_PASSWORD_NAME (certtool_opt_strs+3091)
+#define NULL_PASSWORD_NAME (certtool_opt_strs+3118)
/** Name string for the null-password option */
-#define NULL_PASSWORD_name (certtool_opt_strs+3105)
+#define NULL_PASSWORD_name (certtool_opt_strs+3132)
/** Compiled in flag settings for the null-password option */
#define NULL_PASSWORD_FLAGS (OPTST_DISABLED)
@@ -787,11 +787,11 @@ static int const aVerify_EmailCantList[] = {
* empty-password option description:
*/
/** Descriptive text for the empty-password option */
-#define EMPTY_PASSWORD_DESC (certtool_opt_strs+3119)
+#define EMPTY_PASSWORD_DESC (certtool_opt_strs+3146)
/** Upper-cased name for the empty-password option */
-#define EMPTY_PASSWORD_NAME (certtool_opt_strs+3145)
+#define EMPTY_PASSWORD_NAME (certtool_opt_strs+3172)
/** Name string for the empty-password option */
-#define EMPTY_PASSWORD_name (certtool_opt_strs+3160)
+#define EMPTY_PASSWORD_name (certtool_opt_strs+3187)
/** Compiled in flag settings for the empty-password option */
#define EMPTY_PASSWORD_FLAGS (OPTST_DISABLED)
@@ -799,11 +799,11 @@ static int const aVerify_EmailCantList[] = {
* hex-numbers option description:
*/
/** Descriptive text for the hex-numbers option */
-#define HEX_NUMBERS_DESC (certtool_opt_strs+3175)
+#define HEX_NUMBERS_DESC (certtool_opt_strs+3202)
/** Upper-cased name for the hex-numbers option */
-#define HEX_NUMBERS_NAME (certtool_opt_strs+3221)
+#define HEX_NUMBERS_NAME (certtool_opt_strs+3248)
/** Name string for the hex-numbers option */
-#define HEX_NUMBERS_name (certtool_opt_strs+3233)
+#define HEX_NUMBERS_name (certtool_opt_strs+3260)
/** Compiled in flag settings for the hex-numbers option */
#define HEX_NUMBERS_FLAGS (OPTST_DISABLED)
@@ -811,11 +811,11 @@ static int const aVerify_EmailCantList[] = {
* cprint option description:
*/
/** Descriptive text for the cprint option */
-#define CPRINT_DESC (certtool_opt_strs+3245)
+#define CPRINT_DESC (certtool_opt_strs+3272)
/** Upper-cased name for the cprint option */
-#define CPRINT_NAME (certtool_opt_strs+3314)
+#define CPRINT_NAME (certtool_opt_strs+3341)
/** Name string for the cprint option */
-#define CPRINT_name (certtool_opt_strs+3321)
+#define CPRINT_name (certtool_opt_strs+3348)
/** Compiled in flag settings for the cprint option */
#define CPRINT_FLAGS (OPTST_DISABLED)
@@ -823,11 +823,11 @@ static int const aVerify_EmailCantList[] = {
* certificate-info option description:
*/
/** Descriptive text for the certificate-info option */
-#define CERTIFICATE_INFO_DESC (certtool_opt_strs+3328)
+#define CERTIFICATE_INFO_DESC (certtool_opt_strs+3355)
/** Upper-cased name for the certificate-info option */
-#define CERTIFICATE_INFO_NAME (certtool_opt_strs+3371)
+#define CERTIFICATE_INFO_NAME (certtool_opt_strs+3398)
/** Name string for the certificate-info option */
-#define CERTIFICATE_INFO_name (certtool_opt_strs+3388)
+#define CERTIFICATE_INFO_name (certtool_opt_strs+3415)
/** Compiled in flag settings for the certificate-info option */
#define CERTIFICATE_INFO_FLAGS (OPTST_DISABLED)
@@ -835,11 +835,11 @@ static int const aVerify_EmailCantList[] = {
* fingerprint option description:
*/
/** Descriptive text for the fingerprint option */
-#define FINGERPRINT_DESC (certtool_opt_strs+3405)
+#define FINGERPRINT_DESC (certtool_opt_strs+3432)
/** Upper-cased name for the fingerprint option */
-#define FINGERPRINT_NAME (certtool_opt_strs+3452)
+#define FINGERPRINT_NAME (certtool_opt_strs+3479)
/** Name string for the fingerprint option */
-#define FINGERPRINT_name (certtool_opt_strs+3464)
+#define FINGERPRINT_name (certtool_opt_strs+3491)
/** Compiled in flag settings for the fingerprint option */
#define FINGERPRINT_FLAGS (OPTST_DISABLED)
@@ -847,11 +847,11 @@ static int const aVerify_EmailCantList[] = {
* key-id option description:
*/
/** Descriptive text for the key-id option */
-#define KEY_ID_DESC (certtool_opt_strs+3476)
+#define KEY_ID_DESC (certtool_opt_strs+3503)
/** Upper-cased name for the key-id option */
-#define KEY_ID_NAME (certtool_opt_strs+3518)
+#define KEY_ID_NAME (certtool_opt_strs+3545)
/** Name string for the key-id option */
-#define KEY_ID_name (certtool_opt_strs+3525)
+#define KEY_ID_name (certtool_opt_strs+3552)
/** Compiled in flag settings for the key-id option */
#define KEY_ID_FLAGS (OPTST_DISABLED)
@@ -859,11 +859,11 @@ static int const aVerify_EmailCantList[] = {
* certificate-pubkey option description:
*/
/** Descriptive text for the certificate-pubkey option */
-#define CERTIFICATE_PUBKEY_DESC (certtool_opt_strs+3532)
+#define CERTIFICATE_PUBKEY_DESC (certtool_opt_strs+3559)
/** Upper-cased name for the certificate-pubkey option */
-#define CERTIFICATE_PUBKEY_NAME (certtool_opt_strs+3563)
+#define CERTIFICATE_PUBKEY_NAME (certtool_opt_strs+3590)
/** Name string for the certificate-pubkey option */
-#define CERTIFICATE_PUBKEY_name (certtool_opt_strs+3582)
+#define CERTIFICATE_PUBKEY_name (certtool_opt_strs+3609)
/** Compiled in flag settings for the certificate-pubkey option */
#define CERTIFICATE_PUBKEY_FLAGS (OPTST_DISABLED)
@@ -871,11 +871,11 @@ static int const aVerify_EmailCantList[] = {
* pgp-certificate-info option description:
*/
/** Descriptive text for the pgp-certificate-info option */
-#define PGP_CERTIFICATE_INFO_DESC (certtool_opt_strs+3601)
+#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+3652)
+#define PGP_CERTIFICATE_INFO_NAME (certtool_opt_strs+3679)
/** Name string for the pgp-certificate-info option */
-#define PGP_CERTIFICATE_INFO_name (certtool_opt_strs+3673)
+#define PGP_CERTIFICATE_INFO_name (certtool_opt_strs+3700)
/** Compiled in flag settings for the pgp-certificate-info option */
#define PGP_CERTIFICATE_INFO_FLAGS (OPTST_DISABLED)
@@ -883,11 +883,11 @@ static int const aVerify_EmailCantList[] = {
* pgp-ring-info option description:
*/
/** Descriptive text for the pgp-ring-info option */
-#define PGP_RING_INFO_DESC (certtool_opt_strs+3694)
+#define PGP_RING_INFO_DESC (certtool_opt_strs+3721)
/** Upper-cased name for the pgp-ring-info option */
-#define PGP_RING_INFO_NAME (certtool_opt_strs+3751)
+#define PGP_RING_INFO_NAME (certtool_opt_strs+3778)
/** Name string for the pgp-ring-info option */
-#define PGP_RING_INFO_name (certtool_opt_strs+3765)
+#define PGP_RING_INFO_name (certtool_opt_strs+3792)
/** Compiled in flag settings for the pgp-ring-info option */
#define PGP_RING_INFO_FLAGS (OPTST_DISABLED)
@@ -895,11 +895,11 @@ static int const aVerify_EmailCantList[] = {
* crl-info option description:
*/
/** Descriptive text for the crl-info option */
-#define CRL_INFO_DESC (certtool_opt_strs+3779)
+#define CRL_INFO_DESC (certtool_opt_strs+3806)
/** Upper-cased name for the crl-info option */
-#define CRL_INFO_NAME (certtool_opt_strs+3824)
+#define CRL_INFO_NAME (certtool_opt_strs+3851)
/** Name string for the crl-info option */
-#define CRL_INFO_name (certtool_opt_strs+3833)
+#define CRL_INFO_name (certtool_opt_strs+3860)
/** Compiled in flag settings for the crl-info option */
#define CRL_INFO_FLAGS (OPTST_DISABLED)
@@ -907,11 +907,11 @@ static int const aVerify_EmailCantList[] = {
* crq-info option description:
*/
/** Descriptive text for the crq-info option */
-#define CRQ_INFO_DESC (certtool_opt_strs+3842)
+#define CRQ_INFO_DESC (certtool_opt_strs+3869)
/** Upper-cased name for the crq-info option */
-#define CRQ_INFO_NAME (certtool_opt_strs+3893)
+#define CRQ_INFO_NAME (certtool_opt_strs+3920)
/** Name string for the crq-info option */
-#define CRQ_INFO_name (certtool_opt_strs+3902)
+#define CRQ_INFO_name (certtool_opt_strs+3929)
/** Compiled in flag settings for the crq-info option */
#define CRQ_INFO_FLAGS (OPTST_DISABLED)
@@ -919,11 +919,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+3911)
+#define NO_CRQ_EXTENSIONS_DESC (certtool_opt_strs+3938)
/** Upper-cased name for the no-crq-extensions option */
-#define NO_CRQ_EXTENSIONS_NAME (certtool_opt_strs+3957)
+#define NO_CRQ_EXTENSIONS_NAME (certtool_opt_strs+3984)
/** Name string for the no-crq-extensions option */
-#define NO_CRQ_EXTENSIONS_name (certtool_opt_strs+3975)
+#define NO_CRQ_EXTENSIONS_name (certtool_opt_strs+4002)
/** Compiled in flag settings for the no-crq-extensions option */
#define NO_CRQ_EXTENSIONS_FLAGS (OPTST_DISABLED)
@@ -931,11 +931,11 @@ static int const aVerify_EmailCantList[] = {
* p12-info option description:
*/
/** Descriptive text for the p12-info option */
-#define P12_INFO_DESC (certtool_opt_strs+3993)
+#define P12_INFO_DESC (certtool_opt_strs+4020)
/** Upper-cased name for the p12-info option */
-#define P12_INFO_NAME (certtool_opt_strs+4035)
+#define P12_INFO_NAME (certtool_opt_strs+4062)
/** Name string for the p12-info option */
-#define P12_INFO_name (certtool_opt_strs+4044)
+#define P12_INFO_name (certtool_opt_strs+4071)
/** Compiled in flag settings for the p12-info option */
#define P12_INFO_FLAGS (OPTST_DISABLED)
@@ -943,11 +943,11 @@ static int const aVerify_EmailCantList[] = {
* p12-name option description:
*/
/** Descriptive text for the p12-name option */
-#define P12_NAME_DESC (certtool_opt_strs+4053)
+#define P12_NAME_DESC (certtool_opt_strs+4080)
/** Upper-cased name for the p12-name option */
-#define P12_NAME_NAME (certtool_opt_strs+4087)
+#define P12_NAME_NAME (certtool_opt_strs+4114)
/** Name string for the p12-name option */
-#define P12_NAME_name (certtool_opt_strs+4096)
+#define P12_NAME_name (certtool_opt_strs+4123)
/** Compiled in flag settings for the p12-name option */
#define P12_NAME_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -956,11 +956,11 @@ static int const aVerify_EmailCantList[] = {
* p7-generate option description:
*/
/** Descriptive text for the p7-generate option */
-#define P7_GENERATE_DESC (certtool_opt_strs+4105)
+#define P7_GENERATE_DESC (certtool_opt_strs+4132)
/** Upper-cased name for the p7-generate option */
-#define P7_GENERATE_NAME (certtool_opt_strs+4134)
+#define P7_GENERATE_NAME (certtool_opt_strs+4161)
/** Name string for the p7-generate option */
-#define P7_GENERATE_name (certtool_opt_strs+4146)
+#define P7_GENERATE_name (certtool_opt_strs+4173)
/** Compiled in flag settings for the p7-generate option */
#define P7_GENERATE_FLAGS (OPTST_DISABLED)
@@ -968,11 +968,11 @@ static int const aVerify_EmailCantList[] = {
* p7-sign option description:
*/
/** Descriptive text for the p7-sign option */
-#define P7_SIGN_DESC (certtool_opt_strs+4158)
+#define P7_SIGN_DESC (certtool_opt_strs+4185)
/** Upper-cased name for the p7-sign option */
-#define P7_SIGN_NAME (certtool_opt_strs+4190)
+#define P7_SIGN_NAME (certtool_opt_strs+4217)
/** Name string for the p7-sign option */
-#define P7_SIGN_name (certtool_opt_strs+4198)
+#define P7_SIGN_name (certtool_opt_strs+4225)
/** Compiled in flag settings for the p7-sign option */
#define P7_SIGN_FLAGS (OPTST_DISABLED)
@@ -980,11 +980,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+4206)
+#define P7_DETACHED_SIGN_DESC (certtool_opt_strs+4233)
/** Upper-cased name for the p7-detached-sign option */
-#define P7_DETACHED_SIGN_NAME (certtool_opt_strs+4247)
+#define P7_DETACHED_SIGN_NAME (certtool_opt_strs+4274)
/** Name string for the p7-detached-sign option */
-#define P7_DETACHED_SIGN_name (certtool_opt_strs+4264)
+#define P7_DETACHED_SIGN_name (certtool_opt_strs+4291)
/** Compiled in flag settings for the p7-detached-sign option */
#define P7_DETACHED_SIGN_FLAGS (OPTST_DISABLED)
@@ -992,13 +992,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+4281)
+#define P7_INCLUDE_CERT_DESC (certtool_opt_strs+4308)
/** Upper-cased name for the p7-include-cert option */
-#define P7_INCLUDE_CERT_NAME (certtool_opt_strs+4341)
+#define P7_INCLUDE_CERT_NAME (certtool_opt_strs+4368)
/** disablement name for the p7-include-cert option */
-#define NOT_P7_INCLUDE_CERT_name (certtool_opt_strs+4357)
+#define NOT_P7_INCLUDE_CERT_name (certtool_opt_strs+4384)
/** disablement prefix for the p7-include-cert option */
-#define NOT_P7_INCLUDE_CERT_PFX (certtool_opt_strs+4376)
+#define NOT_P7_INCLUDE_CERT_PFX (certtool_opt_strs+4403)
/** 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 */
@@ -1008,13 +1008,13 @@ static int const aVerify_EmailCantList[] = {
* p7-time option description:
*/
/** Descriptive text for the p7-time option */
-#define P7_TIME_DESC (certtool_opt_strs+4379)
+#define P7_TIME_DESC (certtool_opt_strs+4406)
/** Upper-cased name for the p7-time option */
-#define P7_TIME_NAME (certtool_opt_strs+4429)
+#define P7_TIME_NAME (certtool_opt_strs+4456)
/** disablement name for the p7-time option */
-#define NOT_P7_TIME_name (certtool_opt_strs+4437)
+#define NOT_P7_TIME_name (certtool_opt_strs+4464)
/** disablement prefix for the p7-time option */
-#define NOT_P7_TIME_PFX (certtool_opt_strs+4376)
+#define NOT_P7_TIME_PFX (certtool_opt_strs+4403)
/** 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 */
@@ -1024,13 +1024,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+4448)
+#define P7_SHOW_DATA_DESC (certtool_opt_strs+4475)
/** Upper-cased name for the p7-show-data option */
-#define P7_SHOW_DATA_NAME (certtool_opt_strs+4501)
+#define P7_SHOW_DATA_NAME (certtool_opt_strs+4528)
/** disablement name for the p7-show-data option */
-#define NOT_P7_SHOW_DATA_name (certtool_opt_strs+4514)
+#define NOT_P7_SHOW_DATA_name (certtool_opt_strs+4541)
/** disablement prefix for the p7-show-data option */
-#define NOT_P7_SHOW_DATA_PFX (certtool_opt_strs+4376)
+#define NOT_P7_SHOW_DATA_PFX (certtool_opt_strs+4403)
/** 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 */
@@ -1040,11 +1040,11 @@ static int const aVerify_EmailCantList[] = {
* p7-info option description:
*/
/** Descriptive text for the p7-info option */
-#define P7_INFO_DESC (certtool_opt_strs+4530)
+#define P7_INFO_DESC (certtool_opt_strs+4557)
/** Upper-cased name for the p7-info option */
-#define P7_INFO_NAME (certtool_opt_strs+4571)
+#define P7_INFO_NAME (certtool_opt_strs+4598)
/** Name string for the p7-info option */
-#define P7_INFO_name (certtool_opt_strs+4579)
+#define P7_INFO_name (certtool_opt_strs+4606)
/** Compiled in flag settings for the p7-info option */
#define P7_INFO_FLAGS (OPTST_DISABLED)
@@ -1052,11 +1052,11 @@ static int const aVerify_EmailCantList[] = {
* p7-verify option description:
*/
/** Descriptive text for the p7-verify option */
-#define P7_VERIFY_DESC (certtool_opt_strs+4587)
+#define P7_VERIFY_DESC (certtool_opt_strs+4614)
/** Upper-cased name for the p7-verify option */
-#define P7_VERIFY_NAME (certtool_opt_strs+4625)
+#define P7_VERIFY_NAME (certtool_opt_strs+4652)
/** Name string for the p7-verify option */
-#define P7_VERIFY_name (certtool_opt_strs+4635)
+#define P7_VERIFY_name (certtool_opt_strs+4662)
/** Compiled in flag settings for the p7-verify option */
#define P7_VERIFY_FLAGS (OPTST_DISABLED)
@@ -1064,11 +1064,11 @@ static int const aVerify_EmailCantList[] = {
* p8-info option description:
*/
/** Descriptive text for the p8-info option */
-#define P8_INFO_DESC (certtool_opt_strs+4645)
+#define P8_INFO_DESC (certtool_opt_strs+4672)
/** Upper-cased name for the p8-info option */
-#define P8_INFO_NAME (certtool_opt_strs+4686)
+#define P8_INFO_NAME (certtool_opt_strs+4713)
/** Name string for the p8-info option */
-#define P8_INFO_name (certtool_opt_strs+4694)
+#define P8_INFO_name (certtool_opt_strs+4721)
/** Compiled in flag settings for the p8-info option */
#define P8_INFO_FLAGS (OPTST_DISABLED)
@@ -1076,11 +1076,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+4702)
+#define SMIME_TO_P7_DESC (certtool_opt_strs+4729)
/** Upper-cased name for the smime-to-p7 option */
-#define SMIME_TO_P7_NAME (certtool_opt_strs+4738)
+#define SMIME_TO_P7_NAME (certtool_opt_strs+4765)
/** Name string for the smime-to-p7 option */
-#define SMIME_TO_P7_name (certtool_opt_strs+4750)
+#define SMIME_TO_P7_name (certtool_opt_strs+4777)
/** Compiled in flag settings for the smime-to-p7 option */
#define SMIME_TO_P7_FLAGS (OPTST_DISABLED)
@@ -1088,11 +1088,11 @@ static int const aVerify_EmailCantList[] = {
* key-info option description:
*/
/** Descriptive text for the key-info option */
-#define KEY_INFO_DESC (certtool_opt_strs+4762)
+#define KEY_INFO_DESC (certtool_opt_strs+4789)
/** Upper-cased name for the key-info option */
-#define KEY_INFO_NAME (certtool_opt_strs+4797)
+#define KEY_INFO_NAME (certtool_opt_strs+4824)
/** Name string for the key-info option */
-#define KEY_INFO_name (certtool_opt_strs+4806)
+#define KEY_INFO_name (certtool_opt_strs+4833)
/** Compiled in flag settings for the key-info option */
#define KEY_INFO_FLAGS (OPTST_DISABLED)
@@ -1100,11 +1100,11 @@ static int const aVerify_EmailCantList[] = {
* pgp-key-info option description:
*/
/** Descriptive text for the pgp-key-info option */
-#define PGP_KEY_INFO_DESC (certtool_opt_strs+4815)
+#define PGP_KEY_INFO_DESC (certtool_opt_strs+4842)
/** Upper-cased name for the pgp-key-info option */
-#define PGP_KEY_INFO_NAME (certtool_opt_strs+4859)
+#define PGP_KEY_INFO_NAME (certtool_opt_strs+4886)
/** Name string for the pgp-key-info option */
-#define PGP_KEY_INFO_name (certtool_opt_strs+4872)
+#define PGP_KEY_INFO_name (certtool_opt_strs+4899)
/** Compiled in flag settings for the pgp-key-info option */
#define PGP_KEY_INFO_FLAGS (OPTST_DISABLED)
@@ -1112,11 +1112,11 @@ static int const aVerify_EmailCantList[] = {
* pubkey-info option description:
*/
/** Descriptive text for the pubkey-info option */
-#define PUBKEY_INFO_DESC (certtool_opt_strs+4885)
+#define PUBKEY_INFO_DESC (certtool_opt_strs+4912)
/** Upper-cased name for the pubkey-info option */
-#define PUBKEY_INFO_NAME (certtool_opt_strs+4919)
+#define PUBKEY_INFO_NAME (certtool_opt_strs+4946)
/** Name string for the pubkey-info option */
-#define PUBKEY_INFO_name (certtool_opt_strs+4931)
+#define PUBKEY_INFO_name (certtool_opt_strs+4958)
/** Compiled in flag settings for the pubkey-info option */
#define PUBKEY_INFO_FLAGS (OPTST_DISABLED)
@@ -1124,11 +1124,11 @@ static int const aVerify_EmailCantList[] = {
* v1 option description:
*/
/** Descriptive text for the v1 option */
-#define V1_DESC (certtool_opt_strs+4943)
+#define V1_DESC (certtool_opt_strs+4970)
/** Upper-cased name for the v1 option */
-#define V1_NAME (certtool_opt_strs+5004)
+#define V1_NAME (certtool_opt_strs+5031)
/** Name string for the v1 option */
-#define V1_name (certtool_opt_strs+5007)
+#define V1_name (certtool_opt_strs+5034)
/** Compiled in flag settings for the v1 option */
#define V1_FLAGS (OPTST_DISABLED)
@@ -1136,11 +1136,11 @@ static int const aVerify_EmailCantList[] = {
* to-p12 option description:
*/
/** Descriptive text for the to-p12 option */
-#define TO_P12_DESC (certtool_opt_strs+5010)
+#define TO_P12_DESC (certtool_opt_strs+5037)
/** Upper-cased name for the to-p12 option */
-#define TO_P12_NAME (certtool_opt_strs+5040)
+#define TO_P12_NAME (certtool_opt_strs+5067)
/** Name string for the to-p12 option */
-#define TO_P12_name (certtool_opt_strs+5047)
+#define TO_P12_name (certtool_opt_strs+5074)
/** Compiled in flag settings for the to-p12 option */
#define TO_P12_FLAGS (OPTST_DISABLED)
@@ -1148,11 +1148,11 @@ static int const aVerify_EmailCantList[] = {
* to-p8 option description:
*/
/** Descriptive text for the to-p8 option */
-#define TO_P8_DESC (certtool_opt_strs+5054)
+#define TO_P8_DESC (certtool_opt_strs+5081)
/** Upper-cased name for the to-p8 option */
-#define TO_P8_NAME (certtool_opt_strs+5083)
+#define TO_P8_NAME (certtool_opt_strs+5110)
/** Name string for the to-p8 option */
-#define TO_P8_name (certtool_opt_strs+5089)
+#define TO_P8_name (certtool_opt_strs+5116)
/** Compiled in flag settings for the to-p8 option */
#define TO_P8_FLAGS (OPTST_DISABLED)
@@ -1160,11 +1160,11 @@ static int const aVerify_EmailCantList[] = {
* pkcs8 option description:
*/
/** Descriptive text for the pkcs8 option */
-#define PKCS8_DESC (certtool_opt_strs+5095)
+#define PKCS8_DESC (certtool_opt_strs+5122)
/** Upper-cased name for the pkcs8 option */
-#define PKCS8_NAME (certtool_opt_strs+5131)
+#define PKCS8_NAME (certtool_opt_strs+5158)
/** Name string for the pkcs8 option */
-#define PKCS8_name (certtool_opt_strs+5137)
+#define PKCS8_name (certtool_opt_strs+5164)
/** Compiled in flag settings for the pkcs8 option */
#define PKCS8_FLAGS (OPTST_DISABLED)
@@ -1172,11 +1172,11 @@ static int const aVerify_EmailCantList[] = {
* rsa option description:
*/
/** Descriptive text for the rsa option */
-#define RSA_DESC (certtool_opt_strs+5143)
+#define RSA_DESC (certtool_opt_strs+5170)
/** Upper-cased name for the rsa option */
-#define RSA_NAME (certtool_opt_strs+5160)
+#define RSA_NAME (certtool_opt_strs+5187)
/** Name string for the rsa option */
-#define RSA_name (certtool_opt_strs+5164)
+#define RSA_name (certtool_opt_strs+5191)
/** Compiled in flag settings for the rsa option */
#define RSA_FLAGS (OPTST_DISABLED)
@@ -1184,11 +1184,11 @@ static int const aVerify_EmailCantList[] = {
* dsa option description:
*/
/** Descriptive text for the dsa option */
-#define DSA_DESC (certtool_opt_strs+5168)
+#define DSA_DESC (certtool_opt_strs+5195)
/** Upper-cased name for the dsa option */
-#define DSA_NAME (certtool_opt_strs+5185)
+#define DSA_NAME (certtool_opt_strs+5212)
/** Name string for the dsa option */
-#define DSA_name (certtool_opt_strs+5189)
+#define DSA_name (certtool_opt_strs+5216)
/** Compiled in flag settings for the dsa option */
#define DSA_FLAGS (OPTST_DISABLED)
@@ -1196,11 +1196,11 @@ static int const aVerify_EmailCantList[] = {
* ecc option description:
*/
/** Descriptive text for the ecc option */
-#define ECC_DESC (certtool_opt_strs+5193)
+#define ECC_DESC (certtool_opt_strs+5220)
/** Upper-cased name for the ecc option */
-#define ECC_NAME (certtool_opt_strs+5218)
+#define ECC_NAME (certtool_opt_strs+5245)
/** Name string for the ecc option */
-#define ECC_name (certtool_opt_strs+5222)
+#define ECC_name (certtool_opt_strs+5249)
/** Compiled in flag settings for the ecc option */
#define ECC_FLAGS (OPTST_DISABLED)
@@ -1208,10 +1208,10 @@ static int const aVerify_EmailCantList[] = {
* ecdsa option description:
*/
/** Descriptive text for the ecdsa option */
-#define ECDSA_DESC (certtool_opt_strs+5226)
+#define ECDSA_DESC (certtool_opt_strs+5253)
#define ECDSA_NAME NULL
/** Unmodified name string for the ecdsa option */
-#define ECDSA_name (certtool_opt_strs+5256)
+#define ECDSA_name (certtool_opt_strs+5283)
/** Compiled in flag settings for the ecdsa option */
#define ECDSA_FLAGS (ECC_FLAGS | OPTST_ALIAS)
@@ -1219,11 +1219,11 @@ static int const aVerify_EmailCantList[] = {
* hash option description:
*/
/** Descriptive text for the hash option */
-#define HASH_DESC (certtool_opt_strs+5262)
+#define HASH_DESC (certtool_opt_strs+5289)
/** Upper-cased name for the hash option */
-#define HASH_NAME (certtool_opt_strs+5296)
+#define HASH_NAME (certtool_opt_strs+5323)
/** Name string for the hash option */
-#define HASH_name (certtool_opt_strs+5301)
+#define HASH_name (certtool_opt_strs+5328)
/** Compiled in flag settings for the hash option */
#define HASH_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -1232,13 +1232,13 @@ static int const aVerify_EmailCantList[] = {
* inder option description:
*/
/** Descriptive text for the inder option */
-#define INDER_DESC (certtool_opt_strs+5306)
+#define INDER_DESC (certtool_opt_strs+5333)
/** Upper-cased name for the inder option */
-#define INDER_NAME (certtool_opt_strs+5377)
+#define INDER_NAME (certtool_opt_strs+5404)
/** disablement name for the inder option */
-#define NOT_INDER_name (certtool_opt_strs+5383)
+#define NOT_INDER_name (certtool_opt_strs+5410)
/** disablement prefix for the inder option */
-#define NOT_INDER_PFX (certtool_opt_strs+4376)
+#define NOT_INDER_PFX (certtool_opt_strs+4403)
/** Name string for the inder option */
#define INDER_name (NOT_INDER_name + 3)
/** Compiled in flag settings for the inder option */
@@ -1248,10 +1248,10 @@ static int const aVerify_EmailCantList[] = {
* inraw option description:
*/
/** Descriptive text for the inraw option */
-#define INRAW_DESC (certtool_opt_strs+5392)
+#define INRAW_DESC (certtool_opt_strs+5419)
#define INRAW_NAME NULL
/** Unmodified name string for the inraw option */
-#define INRAW_name (certtool_opt_strs+5424)
+#define INRAW_name (certtool_opt_strs+5451)
/** Compiled in flag settings for the inraw option */
#define INRAW_FLAGS (INDER_FLAGS | OPTST_ALIAS)
@@ -1259,13 +1259,13 @@ static int const aVerify_EmailCantList[] = {
* outder option description:
*/
/** Descriptive text for the outder option */
-#define OUTDER_DESC (certtool_opt_strs+5430)
+#define OUTDER_DESC (certtool_opt_strs+5457)
/** Upper-cased name for the outder option */
-#define OUTDER_NAME (certtool_opt_strs+5502)
+#define OUTDER_NAME (certtool_opt_strs+5529)
/** disablement name for the outder option */
-#define NOT_OUTDER_name (certtool_opt_strs+5509)
+#define NOT_OUTDER_name (certtool_opt_strs+5536)
/** disablement prefix for the outder option */
-#define NOT_OUTDER_PFX (certtool_opt_strs+4376)
+#define NOT_OUTDER_PFX (certtool_opt_strs+4403)
/** Name string for the outder option */
#define OUTDER_name (NOT_OUTDER_name + 3)
/** Compiled in flag settings for the outder option */
@@ -1275,10 +1275,10 @@ static int const aVerify_EmailCantList[] = {
* outraw option description:
*/
/** Descriptive text for the outraw option */
-#define OUTRAW_DESC (certtool_opt_strs+5519)
+#define OUTRAW_DESC (certtool_opt_strs+5546)
#define OUTRAW_NAME NULL
/** Unmodified name string for the outraw option */
-#define OUTRAW_name (certtool_opt_strs+5552)
+#define OUTRAW_name (certtool_opt_strs+5579)
/** Compiled in flag settings for the outraw option */
#define OUTRAW_FLAGS (OUTDER_FLAGS | OPTST_ALIAS)
@@ -1286,11 +1286,11 @@ static int const aVerify_EmailCantList[] = {
* bits option description:
*/
/** Descriptive text for the bits option */
-#define BITS_DESC (certtool_opt_strs+5559)
+#define BITS_DESC (certtool_opt_strs+5586)
/** Upper-cased name for the bits option */
-#define BITS_NAME (certtool_opt_strs+5603)
+#define BITS_NAME (certtool_opt_strs+5630)
/** Name string for the bits option */
-#define BITS_name (certtool_opt_strs+5608)
+#define BITS_name (certtool_opt_strs+5635)
/** Compiled in flag settings for the bits option */
#define BITS_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -1299,11 +1299,11 @@ static int const aVerify_EmailCantList[] = {
* curve option description:
*/
/** Descriptive text for the curve option */
-#define CURVE_DESC (certtool_opt_strs+5613)
+#define CURVE_DESC (certtool_opt_strs+5640)
/** Upper-cased name for the curve option */
-#define CURVE_NAME (certtool_opt_strs+5658)
+#define CURVE_NAME (certtool_opt_strs+5685)
/** Name string for the curve option */
-#define CURVE_name (certtool_opt_strs+5664)
+#define CURVE_name (certtool_opt_strs+5691)
/** Compiled in flag settings for the curve option */
#define CURVE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -1312,11 +1312,11 @@ static int const aVerify_EmailCantList[] = {
* sec-param option description:
*/
/** Descriptive text for the sec-param option */
-#define SEC_PARAM_DESC (certtool_opt_strs+5670)
+#define SEC_PARAM_DESC (certtool_opt_strs+5697)
/** Upper-cased name for the sec-param option */
-#define SEC_PARAM_NAME (certtool_opt_strs+5732)
+#define SEC_PARAM_NAME (certtool_opt_strs+5759)
/** Name string for the sec-param option */
-#define SEC_PARAM_name (certtool_opt_strs+5742)
+#define SEC_PARAM_name (certtool_opt_strs+5769)
/** Compiled in flag settings for the sec-param option */
#define SEC_PARAM_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -1325,11 +1325,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+5752)
+#define DISABLE_QUICK_RANDOM_DESC (certtool_opt_strs+5779)
/** Upper-cased name for the disable-quick-random option */
-#define DISABLE_QUICK_RANDOM_NAME (certtool_opt_strs+5762)
+#define DISABLE_QUICK_RANDOM_NAME (certtool_opt_strs+5789)
/** Name string for the disable-quick-random option */
-#define DISABLE_QUICK_RANDOM_name (certtool_opt_strs+5783)
+#define DISABLE_QUICK_RANDOM_name (certtool_opt_strs+5810)
/** Compiled in flag settings for the disable-quick-random option */
#define DISABLE_QUICK_RANDOM_FLAGS (OPTST_DISABLED)
@@ -1337,11 +1337,11 @@ static int const aVerify_EmailCantList[] = {
* template option description:
*/
/** Descriptive text for the template option */
-#define TEMPLATE_DESC (certtool_opt_strs+5804)
+#define TEMPLATE_DESC (certtool_opt_strs+5831)
/** Upper-cased name for the template option */
-#define TEMPLATE_NAME (certtool_opt_strs+5855)
+#define TEMPLATE_NAME (certtool_opt_strs+5882)
/** Name string for the template option */
-#define TEMPLATE_name (certtool_opt_strs+5864)
+#define TEMPLATE_name (certtool_opt_strs+5891)
/** Compiled in flag settings for the template option */
#define TEMPLATE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -1350,11 +1350,11 @@ static int const aVerify_EmailCantList[] = {
* stdout-info option description:
*/
/** Descriptive text for the stdout-info option */
-#define STDOUT_INFO_DESC (certtool_opt_strs+5873)
+#define STDOUT_INFO_DESC (certtool_opt_strs+5900)
/** Upper-cased name for the stdout-info option */
-#define STDOUT_INFO_NAME (certtool_opt_strs+5919)
+#define STDOUT_INFO_NAME (certtool_opt_strs+5946)
/** Name string for the stdout-info option */
-#define STDOUT_INFO_name (certtool_opt_strs+5931)
+#define STDOUT_INFO_name (certtool_opt_strs+5958)
/** Compiled in flag settings for the stdout-info option */
#define STDOUT_INFO_FLAGS (OPTST_DISABLED)
@@ -1362,11 +1362,11 @@ static int const aVerify_EmailCantList[] = {
* ask-pass option description:
*/
/** Descriptive text for the ask-pass option */
-#define ASK_PASS_DESC (certtool_opt_strs+5943)
+#define ASK_PASS_DESC (certtool_opt_strs+5970)
/** Upper-cased name for the ask-pass option */
-#define ASK_PASS_NAME (certtool_opt_strs+6004)
+#define ASK_PASS_NAME (certtool_opt_strs+6031)
/** Name string for the ask-pass option */
-#define ASK_PASS_name (certtool_opt_strs+6013)
+#define ASK_PASS_name (certtool_opt_strs+6040)
/** Compiled in flag settings for the ask-pass option */
#define ASK_PASS_FLAGS (OPTST_DISABLED)
@@ -1374,11 +1374,11 @@ static int const aVerify_EmailCantList[] = {
* pkcs-cipher option description:
*/
/** Descriptive text for the pkcs-cipher option */
-#define PKCS_CIPHER_DESC (certtool_opt_strs+6022)
+#define PKCS_CIPHER_DESC (certtool_opt_strs+6049)
/** Upper-cased name for the pkcs-cipher option */
-#define PKCS_CIPHER_NAME (certtool_opt_strs+6067)
+#define PKCS_CIPHER_NAME (certtool_opt_strs+6094)
/** Name string for the pkcs-cipher option */
-#define PKCS_CIPHER_name (certtool_opt_strs+6079)
+#define PKCS_CIPHER_name (certtool_opt_strs+6106)
/** Compiled in flag settings for the pkcs-cipher option */
#define PKCS_CIPHER_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -1387,11 +1387,11 @@ static int const aVerify_EmailCantList[] = {
* provider option description:
*/
/** Descriptive text for the provider option */
-#define PROVIDER_DESC (certtool_opt_strs+6091)
+#define PROVIDER_DESC (certtool_opt_strs+6118)
/** Upper-cased name for the provider option */
-#define PROVIDER_NAME (certtool_opt_strs+6129)
+#define PROVIDER_NAME (certtool_opt_strs+6156)
/** Name string for the provider option */
-#define PROVIDER_name (certtool_opt_strs+6138)
+#define PROVIDER_name (certtool_opt_strs+6165)
/** Compiled in flag settings for the provider option */
#define PROVIDER_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -1399,11 +1399,11 @@ static int const aVerify_EmailCantList[] = {
/*
* Help/More_Help/Version option descriptions:
*/
-#define HELP_DESC (certtool_opt_strs+6147)
-#define HELP_name (certtool_opt_strs+6191)
+#define HELP_DESC (certtool_opt_strs+6174)
+#define HELP_name (certtool_opt_strs+6218)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (certtool_opt_strs+6196)
-#define MORE_HELP_name (certtool_opt_strs+6241)
+#define MORE_HELP_DESC (certtool_opt_strs+6223)
+#define MORE_HELP_name (certtool_opt_strs+6268)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC HELP_DESC
@@ -1416,8 +1416,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+6251)
-#define VER_name (certtool_opt_strs+6287)
+#define VER_DESC (certtool_opt_strs+6278)
+#define VER_name (certtool_opt_strs+6314)
/**
* Declare option callback procedures
*/
@@ -2476,21 +2476,21 @@ static tOptDesc optDesc[OPTION_CT] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/** Reference to the upper cased version of certtool. */
-#define zPROGNAME (certtool_opt_strs+6295)
+#define zPROGNAME (certtool_opt_strs+6322)
/** Reference to the title line for certtool usage. */
-#define zUsageTitle (certtool_opt_strs+6304)
+#define zUsageTitle (certtool_opt_strs+6331)
/** 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+6397)
+#define zBugsAddr (certtool_opt_strs+6424)
/** Clarification/explanation of what certtool does. */
-#define zExplain (certtool_opt_strs+6417)
+#define zExplain (certtool_opt_strs+6444)
/** Extra detail explaining what certtool does. */
-#define zDetail (certtool_opt_strs+6419)
+#define zDetail (certtool_opt_strs+6446)
/** The full version string for certtool. */
-#define zFullVersion (certtool_opt_strs+6770)
+#define zFullVersion (certtool_opt_strs+6807)
/* extracted from optcode.tlib near line 364 */
#if defined(ENABLE_NLS)
@@ -2502,7 +2502,7 @@ static tOptDesc optDesc[OPTION_CT] = {
#endif /* ENABLE_NLS */
#define certtool_full_usage (NULL)
-#define certtool_short_usage (certtool_opt_strs+6789)
+#define certtool_short_usage (certtool_opt_strs+6826)
#endif /* not defined __doxygen__ */
@@ -2898,10 +2898,10 @@ with this program. If not, see <http://www.gnu.org/licenses/>.\n"));
puts(_("Verify a PEM encoded certificate chain"));
/* referenced via certtoolOptions.pOptDesc->pzText */
- puts(_("Verify a PEM encoded certificate chain using a trusted list"));
+ puts(_("Verify a PEM encoded certificate (chain) against a trusted set"));
/* referenced via certtoolOptions.pOptDesc->pzText */
- puts(_("Verify a CRL using a trusted list"));
+ puts(_("Verify a Certificate Revocation List using a trusted list"));
/* referenced via certtoolOptions.pOptDesc->pzText */
puts(_("Specify a hostname to be used for certificate chain verification"));
@@ -3121,8 +3121,8 @@ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
puts(_("Tool to parse and generate X.509 certificates, requests and private keys.\n\
It can be used interactively or non interactively by specifying the\n\
template command line option.\n\n"));
- puts(_("The tool accepts files or URLs supported by GnuTLS. In case PIN is\n\
-required for the URL access you can provide it using the environment\n\
+ puts(_("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"));
/* referenced via certtoolOptions.pzFullVersion */
diff --git a/src/cli-args.c.bak b/src/cli-args.c.bak
index 23a1c5733c..80b8f77f47 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[4694] =
+static char const gnutls_cli_opt_strs[4810] =
/* 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"
@@ -110,157 +110,160 @@ static char const gnutls_cli_opt_strs[4694] =
/* 1393 */ "Establish a session and rehandshake\0"
/* 1429 */ "REHANDSHAKE\0"
/* 1441 */ "rehandshake\0"
-/* 1453 */ "Connect, establish a plain session and start TLS\0"
-/* 1502 */ "STARTTLS\0"
-/* 1511 */ "starttls\0"
-/* 1520 */ "an alias for the 'starttls-proto' option\0"
-/* 1561 */ "app-proto\0"
-/* 1571 */ "The application protocol to be used to obtain the server's certificate\n"
- "(https, ftp, smtp, imap, ldap, xmpp)\0"
-/* 1679 */ "STARTTLS_PROTO\0"
-/* 1694 */ "starttls-proto\0"
-/* 1709 */ "Use DTLS (datagram TLS) over UDP\0"
-/* 1742 */ "UDP\0"
-/* 1746 */ "udp\0"
-/* 1750 */ "Set MTU for datagram TLS\0"
-/* 1775 */ "MTU\0"
-/* 1779 */ "mtu\0"
-/* 1783 */ "Send CR LF instead of LF\0"
-/* 1808 */ "CRLF\0"
-/* 1813 */ "crlf\0"
-/* 1818 */ "Enable TCP Fast Open\0"
-/* 1839 */ "FASTOPEN\0"
-/* 1848 */ "fastopen\0"
-/* 1857 */ "Use DER format for certificates to read from\0"
-/* 1902 */ "X509FMTDER\0"
-/* 1913 */ "x509fmtder\0"
-/* 1924 */ "Send the openpgp fingerprint, instead of the key\0"
-/* 1973 */ "FINGERPRINT\0"
-/* 1985 */ "fingerprint\0"
-/* 1997 */ "Print peer's certificate in PEM format\0"
-/* 2036 */ "PRINT_CERT\0"
-/* 2047 */ "print-cert\0"
-/* 2058 */ "Save the peer's certificate chain in the specified file in PEM format\0"
-/* 2128 */ "SAVE_CERT\0"
-/* 2138 */ "save-cert\0"
-/* 2148 */ "Save the peer's OCSP status response in the provided file\0"
-/* 2206 */ "SAVE_OCSP\0"
-/* 2216 */ "save-ocsp\0"
-/* 2226 */ "The minimum number of bits allowed for DH\0"
-/* 2268 */ "DH_BITS\0"
-/* 2276 */ "dh-bits\0"
-/* 2284 */ "Priorities string\0"
-/* 2302 */ "PRIORITY\0"
-/* 2311 */ "priority\0"
-/* 2320 */ "Certificate file or PKCS #11 URL to use\0"
-/* 2360 */ "X509CAFILE\0"
-/* 2371 */ "x509cafile\0"
-/* 2382 */ "CRL file to use\0"
-/* 2398 */ "X509CRLFILE\0"
-/* 2410 */ "x509crlfile\0"
-/* 2422 */ "PGP Key file to use\0"
-/* 2442 */ "PGPKEYFILE\0"
-/* 2453 */ "pgpkeyfile\0"
-/* 2464 */ "PGP Key ring file to use\0"
-/* 2489 */ "PGPKEYRING\0"
-/* 2500 */ "pgpkeyring\0"
-/* 2511 */ "PGP Public Key (certificate) file to use\0"
-/* 2552 */ "PGPCERTFILE\0"
-/* 2564 */ "pgpcertfile\0"
-/* 2576 */ "X.509 key file or PKCS #11 URL to use\0"
-/* 2614 */ "X509KEYFILE\0"
-/* 2626 */ "x509keyfile\0"
-/* 2638 */ "X.509 Certificate file or PKCS #11 URL to use\0"
-/* 2684 */ "X509CERTFILE\0"
-/* 2697 */ "x509certfile\0"
-/* 2710 */ "PGP subkey to use (hex or auto)\0"
-/* 2742 */ "PGPSUBKEY\0"
-/* 2752 */ "pgpsubkey\0"
-/* 2762 */ "SRP username to use\0"
-/* 2782 */ "SRPUSERNAME\0"
-/* 2794 */ "srpusername\0"
-/* 2806 */ "SRP password to use\0"
-/* 2826 */ "SRPPASSWD\0"
-/* 2836 */ "srppasswd\0"
-/* 2846 */ "PSK username to use\0"
-/* 2866 */ "PSKUSERNAME\0"
-/* 2878 */ "pskusername\0"
-/* 2890 */ "PSK key (in hex) to use\0"
-/* 2914 */ "PSKKEY\0"
-/* 2921 */ "pskkey\0"
-/* 2928 */ "The port or service to connect to\0"
-/* 2962 */ "PORT\0"
-/* 2967 */ "port\0"
-/* 2972 */ "Don't abort program if server certificate can't be validated\0"
-/* 3033 */ "INSECURE\0"
-/* 3042 */ "insecure\0"
-/* 3051 */ "Use length-hiding padding to prevent traffic analysis\0"
-/* 3105 */ "RANGES\0"
-/* 3112 */ "ranges\0"
-/* 3119 */ "Benchmark individual ciphers\0"
-/* 3148 */ "BENCHMARK_CIPHERS\0"
-/* 3166 */ "benchmark-ciphers\0"
-/* 3184 */ "Benchmark TLS key exchange methods\0"
-/* 3219 */ "BENCHMARK_TLS_KX\0"
-/* 3236 */ "benchmark-tls-kx\0"
-/* 3253 */ "Benchmark TLS ciphers\0"
-/* 3275 */ "BENCHMARK_TLS_CIPHERS\0"
-/* 3297 */ "benchmark-tls-ciphers\0"
-/* 3319 */ "Print a list of the supported algorithms and modes\0"
-/* 3370 */ "LIST\0"
-/* 3375 */ "list\0"
-/* 3380 */ "Print a list of the supported priority strings\0"
-/* 3427 */ "PRIORITY_LIST\0"
-/* 3441 */ "priority-list\0"
-/* 3455 */ "Don't allow session tickets\0"
-/* 3483 */ "NOTICKET\0"
-/* 3492 */ "noticket\0"
-/* 3501 */ "Offer SRTP profiles\0"
-/* 3521 */ "SRTP_PROFILES\0"
-/* 3535 */ "srtp-profiles\0"
-/* 3549 */ "Application layer protocol\0"
-/* 3576 */ "ALPN\0"
-/* 3581 */ "alpn\0"
-/* 3586 */ "Activate heartbeat support\0"
-/* 3613 */ "HEARTBEAT\0"
-/* 3623 */ "heartbeat\0"
-/* 3633 */ "The maximum record size to advertize\0"
-/* 3670 */ "RECORDSIZE\0"
-/* 3681 */ "recordsize\0"
-/* 3692 */ "Do not send a Server Name Indication (SNI)\0"
-/* 3735 */ "DISABLE_SNI\0"
-/* 3747 */ "disable-sni\0"
-/* 3759 */ "Disable all the TLS extensions\0"
-/* 3790 */ "DISABLE_EXTENSIONS\0"
-/* 3809 */ "disable-extensions\0"
-/* 3828 */ "Inline commands of the form ^<cmd>^\0"
-/* 3864 */ "INLINE_COMMANDS\0"
-/* 3880 */ "inline-commands\0"
-/* 3896 */ "Change the default delimiter for inline commands.\0"
-/* 3946 */ "INLINE_COMMANDS_PREFIX\0"
-/* 3969 */ "inline-commands-prefix\0"
-/* 3992 */ "Specify the PKCS #11 provider library\0"
-/* 4030 */ "PROVIDER\0"
-/* 4039 */ "provider\0"
-/* 4048 */ "Reports the status of the FIPS140-2 mode in gnutls library\0"
-/* 4107 */ "FIPS140_MODE\0"
-/* 4120 */ "fips140-mode\0"
-/* 4133 */ "display extended usage information and exit\0"
-/* 4177 */ "help\0"
-/* 4182 */ "extended usage information passed thru pager\0"
-/* 4227 */ "more-help\0"
-/* 4237 */ "output version information and exit\0"
-/* 4273 */ "version\0"
-/* 4281 */ "GNUTLS_CLI\0"
-/* 4292 */ "gnutls-cli - GnuTLS client\n"
+/* 1453 */ "Server's hostname for server name indication extension\0"
+/* 1508 */ "SNI_HOSTNAME\0"
+/* 1521 */ "sni-hostname\0"
+/* 1534 */ "Connect, establish a plain session and start TLS\0"
+/* 1583 */ "STARTTLS\0"
+/* 1592 */ "starttls\0"
+/* 1601 */ "an alias for the 'starttls-proto' option\0"
+/* 1642 */ "app-proto\0"
+/* 1652 */ "The application protocol to be used to obtain the server's certificate\n"
+ "(https, ftp, smtp, imap, ldap, xmpp, lmtp, pop3, nntp, sieve, postgres)\0"
+/* 1795 */ "STARTTLS_PROTO\0"
+/* 1810 */ "starttls-proto\0"
+/* 1825 */ "Use DTLS (datagram TLS) over UDP\0"
+/* 1858 */ "UDP\0"
+/* 1862 */ "udp\0"
+/* 1866 */ "Set MTU for datagram TLS\0"
+/* 1891 */ "MTU\0"
+/* 1895 */ "mtu\0"
+/* 1899 */ "Send CR LF instead of LF\0"
+/* 1924 */ "CRLF\0"
+/* 1929 */ "crlf\0"
+/* 1934 */ "Enable TCP Fast Open\0"
+/* 1955 */ "FASTOPEN\0"
+/* 1964 */ "fastopen\0"
+/* 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"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostname]\n\0"
-/* 4388 */ "@PACKAGE_BUGREPORT@\0"
-/* 4408 */ "\n\0"
-/* 4410 */ "Simple client program to set up a TLS connection to some other computer. It\n"
+/* 4504 */ "@PACKAGE_BUGREPORT@\0"
+/* 4524 */ "\n\0"
+/* 4526 */ "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"
-/* 4593 */ "gnutls-cli @VERSION@\0"
-/* 4614 */ "Usage: gnutls-cli [options] hostname\n"
+/* 4709 */ "gnutls-cli @VERSION@\0"
+/* 4730 */ "Usage: gnutls-cli [options] hostname\n"
"gnutls-cli --help for usage instructions.\n";
/**
@@ -409,14 +412,27 @@ static char const gnutls_cli_opt_strs[4694] =
#define REHANDSHAKE_FLAGS (OPTST_DISABLED)
/**
+ * sni-hostname option description:
+ */
+/** Descriptive text for the sni-hostname option */
+#define SNI_HOSTNAME_DESC (gnutls_cli_opt_strs+1453)
+/** Upper-cased name for the sni-hostname option */
+#define SNI_HOSTNAME_NAME (gnutls_cli_opt_strs+1508)
+/** Name string for the sni-hostname option */
+#define SNI_HOSTNAME_name (gnutls_cli_opt_strs+1521)
+/** Compiled in flag settings for the sni-hostname option */
+#define SNI_HOSTNAME_FLAGS (OPTST_DISABLED \
+ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+/**
* starttls option description:
*/
/** Descriptive text for the starttls option */
-#define STARTTLS_DESC (gnutls_cli_opt_strs+1453)
+#define STARTTLS_DESC (gnutls_cli_opt_strs+1534)
/** Upper-cased name for the starttls option */
-#define STARTTLS_NAME (gnutls_cli_opt_strs+1502)
+#define STARTTLS_NAME (gnutls_cli_opt_strs+1583)
/** Name string for the starttls option */
-#define STARTTLS_name (gnutls_cli_opt_strs+1511)
+#define STARTTLS_name (gnutls_cli_opt_strs+1592)
/** Compiled in flag settings for the starttls option */
#define STARTTLS_FLAGS (OPTST_DISABLED)
@@ -424,10 +440,10 @@ static char const gnutls_cli_opt_strs[4694] =
* app-proto option description:
*/
/** Descriptive text for the app-proto option */
-#define APP_PROTO_DESC (gnutls_cli_opt_strs+1520)
+#define APP_PROTO_DESC (gnutls_cli_opt_strs+1601)
#define APP_PROTO_NAME NULL
/** Unmodified name string for the app-proto option */
-#define APP_PROTO_name (gnutls_cli_opt_strs+1561)
+#define APP_PROTO_name (gnutls_cli_opt_strs+1642)
/** Compiled in flag settings for the app-proto option */
#define APP_PROTO_FLAGS (STARTTLS_PROTO_FLAGS | OPTST_ALIAS)
@@ -436,11 +452,11 @@ static char const gnutls_cli_opt_strs[4694] =
* "Must also have options" and "Incompatible options":
*/
/** Descriptive text for the starttls-proto option */
-#define STARTTLS_PROTO_DESC (gnutls_cli_opt_strs+1571)
+#define STARTTLS_PROTO_DESC (gnutls_cli_opt_strs+1652)
/** Upper-cased name for the starttls-proto option */
-#define STARTTLS_PROTO_NAME (gnutls_cli_opt_strs+1679)
+#define STARTTLS_PROTO_NAME (gnutls_cli_opt_strs+1795)
/** Name string for the starttls-proto option */
-#define STARTTLS_PROTO_name (gnutls_cli_opt_strs+1694)
+#define STARTTLS_PROTO_name (gnutls_cli_opt_strs+1810)
/** Other options that appear in conjunction with the starttls-proto option */
static int const aStarttls_ProtoCantList[] = {
INDEX_OPT_STARTTLS, NO_EQUIVALENT };
@@ -452,11 +468,11 @@ static int const aStarttls_ProtoCantList[] = {
* udp option description:
*/
/** Descriptive text for the udp option */
-#define UDP_DESC (gnutls_cli_opt_strs+1709)
+#define UDP_DESC (gnutls_cli_opt_strs+1825)
/** Upper-cased name for the udp option */
-#define UDP_NAME (gnutls_cli_opt_strs+1742)
+#define UDP_NAME (gnutls_cli_opt_strs+1858)
/** Name string for the udp option */
-#define UDP_name (gnutls_cli_opt_strs+1746)
+#define UDP_name (gnutls_cli_opt_strs+1862)
/** Compiled in flag settings for the udp option */
#define UDP_FLAGS (OPTST_DISABLED)
@@ -464,11 +480,11 @@ static int const aStarttls_ProtoCantList[] = {
* mtu option description:
*/
/** Descriptive text for the mtu option */
-#define MTU_DESC (gnutls_cli_opt_strs+1750)
+#define MTU_DESC (gnutls_cli_opt_strs+1866)
/** Upper-cased name for the mtu option */
-#define MTU_NAME (gnutls_cli_opt_strs+1775)
+#define MTU_NAME (gnutls_cli_opt_strs+1891)
/** Name string for the mtu option */
-#define MTU_name (gnutls_cli_opt_strs+1779)
+#define MTU_name (gnutls_cli_opt_strs+1895)
/** Compiled in flag settings for the mtu option */
#define MTU_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -477,11 +493,11 @@ static int const aStarttls_ProtoCantList[] = {
* crlf option description:
*/
/** Descriptive text for the crlf option */
-#define CRLF_DESC (gnutls_cli_opt_strs+1783)
+#define CRLF_DESC (gnutls_cli_opt_strs+1899)
/** Upper-cased name for the crlf option */
-#define CRLF_NAME (gnutls_cli_opt_strs+1808)
+#define CRLF_NAME (gnutls_cli_opt_strs+1924)
/** Name string for the crlf option */
-#define CRLF_name (gnutls_cli_opt_strs+1813)
+#define CRLF_name (gnutls_cli_opt_strs+1929)
/** Compiled in flag settings for the crlf option */
#define CRLF_FLAGS (OPTST_DISABLED)
@@ -489,11 +505,11 @@ static int const aStarttls_ProtoCantList[] = {
* fastopen option description:
*/
/** Descriptive text for the fastopen option */
-#define FASTOPEN_DESC (gnutls_cli_opt_strs+1818)
+#define FASTOPEN_DESC (gnutls_cli_opt_strs+1934)
/** Upper-cased name for the fastopen option */
-#define FASTOPEN_NAME (gnutls_cli_opt_strs+1839)
+#define FASTOPEN_NAME (gnutls_cli_opt_strs+1955)
/** Name string for the fastopen option */
-#define FASTOPEN_name (gnutls_cli_opt_strs+1848)
+#define FASTOPEN_name (gnutls_cli_opt_strs+1964)
/** Compiled in flag settings for the fastopen option */
#define FASTOPEN_FLAGS (OPTST_DISABLED)
@@ -501,11 +517,11 @@ static int const aStarttls_ProtoCantList[] = {
* x509fmtder option description:
*/
/** Descriptive text for the x509fmtder option */
-#define X509FMTDER_DESC (gnutls_cli_opt_strs+1857)
+#define X509FMTDER_DESC (gnutls_cli_opt_strs+1973)
/** Upper-cased name for the x509fmtder option */
-#define X509FMTDER_NAME (gnutls_cli_opt_strs+1902)
+#define X509FMTDER_NAME (gnutls_cli_opt_strs+2018)
/** Name string for the x509fmtder option */
-#define X509FMTDER_name (gnutls_cli_opt_strs+1913)
+#define X509FMTDER_name (gnutls_cli_opt_strs+2029)
/** Compiled in flag settings for the x509fmtder option */
#define X509FMTDER_FLAGS (OPTST_DISABLED)
@@ -513,11 +529,11 @@ static int const aStarttls_ProtoCantList[] = {
* fingerprint option description:
*/
/** Descriptive text for the fingerprint option */
-#define FINGERPRINT_DESC (gnutls_cli_opt_strs+1924)
+#define FINGERPRINT_DESC (gnutls_cli_opt_strs+2040)
/** Upper-cased name for the fingerprint option */
-#define FINGERPRINT_NAME (gnutls_cli_opt_strs+1973)
+#define FINGERPRINT_NAME (gnutls_cli_opt_strs+2089)
/** Name string for the fingerprint option */
-#define FINGERPRINT_name (gnutls_cli_opt_strs+1985)
+#define FINGERPRINT_name (gnutls_cli_opt_strs+2101)
/** Compiled in flag settings for the fingerprint option */
#define FINGERPRINT_FLAGS (OPTST_DISABLED)
@@ -525,11 +541,11 @@ static int const aStarttls_ProtoCantList[] = {
* print-cert option description:
*/
/** Descriptive text for the print-cert option */
-#define PRINT_CERT_DESC (gnutls_cli_opt_strs+1997)
+#define PRINT_CERT_DESC (gnutls_cli_opt_strs+2113)
/** Upper-cased name for the print-cert option */
-#define PRINT_CERT_NAME (gnutls_cli_opt_strs+2036)
+#define PRINT_CERT_NAME (gnutls_cli_opt_strs+2152)
/** Name string for the print-cert option */
-#define PRINT_CERT_name (gnutls_cli_opt_strs+2047)
+#define PRINT_CERT_name (gnutls_cli_opt_strs+2163)
/** Compiled in flag settings for the print-cert option */
#define PRINT_CERT_FLAGS (OPTST_DISABLED)
@@ -537,11 +553,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+2058)
+#define SAVE_CERT_DESC (gnutls_cli_opt_strs+2174)
/** Upper-cased name for the save-cert option */
-#define SAVE_CERT_NAME (gnutls_cli_opt_strs+2128)
+#define SAVE_CERT_NAME (gnutls_cli_opt_strs+2244)
/** Name string for the save-cert option */
-#define SAVE_CERT_name (gnutls_cli_opt_strs+2138)
+#define SAVE_CERT_name (gnutls_cli_opt_strs+2254)
/** Compiled in flag settings for the save-cert option */
#define SAVE_CERT_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -550,11 +566,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+2148)
+#define SAVE_OCSP_DESC (gnutls_cli_opt_strs+2264)
/** Upper-cased name for the save-ocsp option */
-#define SAVE_OCSP_NAME (gnutls_cli_opt_strs+2206)
+#define SAVE_OCSP_NAME (gnutls_cli_opt_strs+2322)
/** Name string for the save-ocsp option */
-#define SAVE_OCSP_name (gnutls_cli_opt_strs+2216)
+#define SAVE_OCSP_name (gnutls_cli_opt_strs+2332)
/** Compiled in flag settings for the save-ocsp option */
#define SAVE_OCSP_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -563,11 +579,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+2226)
+#define DH_BITS_DESC (gnutls_cli_opt_strs+2342)
/** Upper-cased name for the dh-bits option */
-#define DH_BITS_NAME (gnutls_cli_opt_strs+2268)
+#define DH_BITS_NAME (gnutls_cli_opt_strs+2384)
/** Name string for the dh-bits option */
-#define DH_BITS_name (gnutls_cli_opt_strs+2276)
+#define DH_BITS_name (gnutls_cli_opt_strs+2392)
/** Compiled in flag settings for the dh-bits option */
#define DH_BITS_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -576,11 +592,11 @@ static int const aStarttls_ProtoCantList[] = {
* priority option description:
*/
/** Descriptive text for the priority option */
-#define PRIORITY_DESC (gnutls_cli_opt_strs+2284)
+#define PRIORITY_DESC (gnutls_cli_opt_strs+2400)
/** Upper-cased name for the priority option */
-#define PRIORITY_NAME (gnutls_cli_opt_strs+2302)
+#define PRIORITY_NAME (gnutls_cli_opt_strs+2418)
/** Name string for the priority option */
-#define PRIORITY_name (gnutls_cli_opt_strs+2311)
+#define PRIORITY_name (gnutls_cli_opt_strs+2427)
/** Compiled in flag settings for the priority option */
#define PRIORITY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -589,11 +605,11 @@ static int const aStarttls_ProtoCantList[] = {
* x509cafile option description:
*/
/** Descriptive text for the x509cafile option */
-#define X509CAFILE_DESC (gnutls_cli_opt_strs+2320)
+#define X509CAFILE_DESC (gnutls_cli_opt_strs+2436)
/** Upper-cased name for the x509cafile option */
-#define X509CAFILE_NAME (gnutls_cli_opt_strs+2360)
+#define X509CAFILE_NAME (gnutls_cli_opt_strs+2476)
/** Name string for the x509cafile option */
-#define X509CAFILE_name (gnutls_cli_opt_strs+2371)
+#define X509CAFILE_name (gnutls_cli_opt_strs+2487)
/** Compiled in flag settings for the x509cafile option */
#define X509CAFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -602,11 +618,11 @@ static int const aStarttls_ProtoCantList[] = {
* x509crlfile option description:
*/
/** Descriptive text for the x509crlfile option */
-#define X509CRLFILE_DESC (gnutls_cli_opt_strs+2382)
+#define X509CRLFILE_DESC (gnutls_cli_opt_strs+2498)
/** Upper-cased name for the x509crlfile option */
-#define X509CRLFILE_NAME (gnutls_cli_opt_strs+2398)
+#define X509CRLFILE_NAME (gnutls_cli_opt_strs+2514)
/** Name string for the x509crlfile option */
-#define X509CRLFILE_name (gnutls_cli_opt_strs+2410)
+#define X509CRLFILE_name (gnutls_cli_opt_strs+2526)
/** Compiled in flag settings for the x509crlfile option */
#define X509CRLFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -615,11 +631,11 @@ static int const aStarttls_ProtoCantList[] = {
* pgpkeyfile option description:
*/
/** Descriptive text for the pgpkeyfile option */
-#define PGPKEYFILE_DESC (gnutls_cli_opt_strs+2422)
+#define PGPKEYFILE_DESC (gnutls_cli_opt_strs+2538)
/** Upper-cased name for the pgpkeyfile option */
-#define PGPKEYFILE_NAME (gnutls_cli_opt_strs+2442)
+#define PGPKEYFILE_NAME (gnutls_cli_opt_strs+2558)
/** Name string for the pgpkeyfile option */
-#define PGPKEYFILE_name (gnutls_cli_opt_strs+2453)
+#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))
@@ -628,11 +644,11 @@ static int const aStarttls_ProtoCantList[] = {
* pgpkeyring option description:
*/
/** Descriptive text for the pgpkeyring option */
-#define PGPKEYRING_DESC (gnutls_cli_opt_strs+2464)
+#define PGPKEYRING_DESC (gnutls_cli_opt_strs+2580)
/** Upper-cased name for the pgpkeyring option */
-#define PGPKEYRING_NAME (gnutls_cli_opt_strs+2489)
+#define PGPKEYRING_NAME (gnutls_cli_opt_strs+2605)
/** Name string for the pgpkeyring option */
-#define PGPKEYRING_name (gnutls_cli_opt_strs+2500)
+#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))
@@ -642,11 +658,11 @@ static int const aStarttls_ProtoCantList[] = {
* "Must also have options" and "Incompatible options":
*/
/** Descriptive text for the pgpcertfile option */
-#define PGPCERTFILE_DESC (gnutls_cli_opt_strs+2511)
+#define PGPCERTFILE_DESC (gnutls_cli_opt_strs+2627)
/** Upper-cased name for the pgpcertfile option */
-#define PGPCERTFILE_NAME (gnutls_cli_opt_strs+2552)
+#define PGPCERTFILE_NAME (gnutls_cli_opt_strs+2668)
/** Name string for the pgpcertfile option */
-#define PGPCERTFILE_name (gnutls_cli_opt_strs+2564)
+#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 };
@@ -658,11 +674,11 @@ static int const aPgpcertfileMustList[] = {
* x509keyfile option description:
*/
/** Descriptive text for the x509keyfile option */
-#define X509KEYFILE_DESC (gnutls_cli_opt_strs+2576)
+#define X509KEYFILE_DESC (gnutls_cli_opt_strs+2692)
/** Upper-cased name for the x509keyfile option */
-#define X509KEYFILE_NAME (gnutls_cli_opt_strs+2614)
+#define X509KEYFILE_NAME (gnutls_cli_opt_strs+2730)
/** Name string for the x509keyfile option */
-#define X509KEYFILE_name (gnutls_cli_opt_strs+2626)
+#define X509KEYFILE_name (gnutls_cli_opt_strs+2742)
/** Compiled in flag settings for the x509keyfile option */
#define X509KEYFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -672,11 +688,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+2638)
+#define X509CERTFILE_DESC (gnutls_cli_opt_strs+2754)
/** Upper-cased name for the x509certfile option */
-#define X509CERTFILE_NAME (gnutls_cli_opt_strs+2684)
+#define X509CERTFILE_NAME (gnutls_cli_opt_strs+2800)
/** Name string for the x509certfile option */
-#define X509CERTFILE_name (gnutls_cli_opt_strs+2697)
+#define X509CERTFILE_name (gnutls_cli_opt_strs+2813)
/** Other options that are required by the x509certfile option */
static int const aX509certfileMustList[] = {
INDEX_OPT_X509KEYFILE, NO_EQUIVALENT };
@@ -688,11 +704,11 @@ static int const aX509certfileMustList[] = {
* pgpsubkey option description:
*/
/** Descriptive text for the pgpsubkey option */
-#define PGPSUBKEY_DESC (gnutls_cli_opt_strs+2710)
+#define PGPSUBKEY_DESC (gnutls_cli_opt_strs+2826)
/** Upper-cased name for the pgpsubkey option */
-#define PGPSUBKEY_NAME (gnutls_cli_opt_strs+2742)
+#define PGPSUBKEY_NAME (gnutls_cli_opt_strs+2858)
/** Name string for the pgpsubkey option */
-#define PGPSUBKEY_name (gnutls_cli_opt_strs+2752)
+#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))
@@ -701,11 +717,11 @@ static int const aX509certfileMustList[] = {
* srpusername option description:
*/
/** Descriptive text for the srpusername option */
-#define SRPUSERNAME_DESC (gnutls_cli_opt_strs+2762)
+#define SRPUSERNAME_DESC (gnutls_cli_opt_strs+2878)
/** Upper-cased name for the srpusername option */
-#define SRPUSERNAME_NAME (gnutls_cli_opt_strs+2782)
+#define SRPUSERNAME_NAME (gnutls_cli_opt_strs+2898)
/** Name string for the srpusername option */
-#define SRPUSERNAME_name (gnutls_cli_opt_strs+2794)
+#define SRPUSERNAME_name (gnutls_cli_opt_strs+2910)
/** Compiled in flag settings for the srpusername option */
#define SRPUSERNAME_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -714,11 +730,11 @@ static int const aX509certfileMustList[] = {
* srppasswd option description:
*/
/** Descriptive text for the srppasswd option */
-#define SRPPASSWD_DESC (gnutls_cli_opt_strs+2806)
+#define SRPPASSWD_DESC (gnutls_cli_opt_strs+2922)
/** Upper-cased name for the srppasswd option */
-#define SRPPASSWD_NAME (gnutls_cli_opt_strs+2826)
+#define SRPPASSWD_NAME (gnutls_cli_opt_strs+2942)
/** Name string for the srppasswd option */
-#define SRPPASSWD_name (gnutls_cli_opt_strs+2836)
+#define SRPPASSWD_name (gnutls_cli_opt_strs+2952)
/** Compiled in flag settings for the srppasswd option */
#define SRPPASSWD_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -727,11 +743,11 @@ static int const aX509certfileMustList[] = {
* pskusername option description:
*/
/** Descriptive text for the pskusername option */
-#define PSKUSERNAME_DESC (gnutls_cli_opt_strs+2846)
+#define PSKUSERNAME_DESC (gnutls_cli_opt_strs+2962)
/** Upper-cased name for the pskusername option */
-#define PSKUSERNAME_NAME (gnutls_cli_opt_strs+2866)
+#define PSKUSERNAME_NAME (gnutls_cli_opt_strs+2982)
/** Name string for the pskusername option */
-#define PSKUSERNAME_name (gnutls_cli_opt_strs+2878)
+#define PSKUSERNAME_name (gnutls_cli_opt_strs+2994)
/** Compiled in flag settings for the pskusername option */
#define PSKUSERNAME_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -740,11 +756,11 @@ static int const aX509certfileMustList[] = {
* pskkey option description:
*/
/** Descriptive text for the pskkey option */
-#define PSKKEY_DESC (gnutls_cli_opt_strs+2890)
+#define PSKKEY_DESC (gnutls_cli_opt_strs+3006)
/** Upper-cased name for the pskkey option */
-#define PSKKEY_NAME (gnutls_cli_opt_strs+2914)
+#define PSKKEY_NAME (gnutls_cli_opt_strs+3030)
/** Name string for the pskkey option */
-#define PSKKEY_name (gnutls_cli_opt_strs+2921)
+#define PSKKEY_name (gnutls_cli_opt_strs+3037)
/** Compiled in flag settings for the pskkey option */
#define PSKKEY_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -753,11 +769,11 @@ static int const aX509certfileMustList[] = {
* port option description:
*/
/** Descriptive text for the port option */
-#define PORT_DESC (gnutls_cli_opt_strs+2928)
+#define PORT_DESC (gnutls_cli_opt_strs+3044)
/** Upper-cased name for the port option */
-#define PORT_NAME (gnutls_cli_opt_strs+2962)
+#define PORT_NAME (gnutls_cli_opt_strs+3078)
/** Name string for the port option */
-#define PORT_name (gnutls_cli_opt_strs+2967)
+#define PORT_name (gnutls_cli_opt_strs+3083)
/** Compiled in flag settings for the port option */
#define PORT_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -766,11 +782,11 @@ static int const aX509certfileMustList[] = {
* insecure option description:
*/
/** Descriptive text for the insecure option */
-#define INSECURE_DESC (gnutls_cli_opt_strs+2972)
+#define INSECURE_DESC (gnutls_cli_opt_strs+3088)
/** Upper-cased name for the insecure option */
-#define INSECURE_NAME (gnutls_cli_opt_strs+3033)
+#define INSECURE_NAME (gnutls_cli_opt_strs+3149)
/** Name string for the insecure option */
-#define INSECURE_name (gnutls_cli_opt_strs+3042)
+#define INSECURE_name (gnutls_cli_opt_strs+3158)
/** Compiled in flag settings for the insecure option */
#define INSECURE_FLAGS (OPTST_DISABLED)
@@ -778,11 +794,11 @@ static int const aX509certfileMustList[] = {
* ranges option description:
*/
/** Descriptive text for the ranges option */
-#define RANGES_DESC (gnutls_cli_opt_strs+3051)
+#define RANGES_DESC (gnutls_cli_opt_strs+3167)
/** Upper-cased name for the ranges option */
-#define RANGES_NAME (gnutls_cli_opt_strs+3105)
+#define RANGES_NAME (gnutls_cli_opt_strs+3221)
/** Name string for the ranges option */
-#define RANGES_name (gnutls_cli_opt_strs+3112)
+#define RANGES_name (gnutls_cli_opt_strs+3228)
/** Compiled in flag settings for the ranges option */
#define RANGES_FLAGS (OPTST_DISABLED)
@@ -790,11 +806,11 @@ static int const aX509certfileMustList[] = {
* benchmark-ciphers option description:
*/
/** Descriptive text for the benchmark-ciphers option */
-#define BENCHMARK_CIPHERS_DESC (gnutls_cli_opt_strs+3119)
+#define BENCHMARK_CIPHERS_DESC (gnutls_cli_opt_strs+3235)
/** Upper-cased name for the benchmark-ciphers option */
-#define BENCHMARK_CIPHERS_NAME (gnutls_cli_opt_strs+3148)
+#define BENCHMARK_CIPHERS_NAME (gnutls_cli_opt_strs+3264)
/** Name string for the benchmark-ciphers option */
-#define BENCHMARK_CIPHERS_name (gnutls_cli_opt_strs+3166)
+#define BENCHMARK_CIPHERS_name (gnutls_cli_opt_strs+3282)
/** Compiled in flag settings for the benchmark-ciphers option */
#define BENCHMARK_CIPHERS_FLAGS (OPTST_DISABLED)
@@ -802,11 +818,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+3184)
+#define BENCHMARK_TLS_KX_DESC (gnutls_cli_opt_strs+3300)
/** Upper-cased name for the benchmark-tls-kx option */
-#define BENCHMARK_TLS_KX_NAME (gnutls_cli_opt_strs+3219)
+#define BENCHMARK_TLS_KX_NAME (gnutls_cli_opt_strs+3335)
/** Name string for the benchmark-tls-kx option */
-#define BENCHMARK_TLS_KX_name (gnutls_cli_opt_strs+3236)
+#define BENCHMARK_TLS_KX_name (gnutls_cli_opt_strs+3352)
/** Compiled in flag settings for the benchmark-tls-kx option */
#define BENCHMARK_TLS_KX_FLAGS (OPTST_DISABLED)
@@ -814,11 +830,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+3253)
+#define BENCHMARK_TLS_CIPHERS_DESC (gnutls_cli_opt_strs+3369)
/** Upper-cased name for the benchmark-tls-ciphers option */
-#define BENCHMARK_TLS_CIPHERS_NAME (gnutls_cli_opt_strs+3275)
+#define BENCHMARK_TLS_CIPHERS_NAME (gnutls_cli_opt_strs+3391)
/** Name string for the benchmark-tls-ciphers option */
-#define BENCHMARK_TLS_CIPHERS_name (gnutls_cli_opt_strs+3297)
+#define BENCHMARK_TLS_CIPHERS_name (gnutls_cli_opt_strs+3413)
/** Compiled in flag settings for the benchmark-tls-ciphers option */
#define BENCHMARK_TLS_CIPHERS_FLAGS (OPTST_DISABLED)
@@ -827,11 +843,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+3319)
+#define LIST_DESC (gnutls_cli_opt_strs+3435)
/** Upper-cased name for the list option */
-#define LIST_NAME (gnutls_cli_opt_strs+3370)
+#define LIST_NAME (gnutls_cli_opt_strs+3486)
/** Name string for the list option */
-#define LIST_name (gnutls_cli_opt_strs+3375)
+#define LIST_name (gnutls_cli_opt_strs+3491)
/** Other options that appear in conjunction with the list option */
static int const aListCantList[] = {
INDEX_OPT_PORT, NO_EQUIVALENT };
@@ -842,11 +858,11 @@ static int const aListCantList[] = {
* priority-list option description:
*/
/** Descriptive text for the priority-list option */
-#define PRIORITY_LIST_DESC (gnutls_cli_opt_strs+3380)
+#define PRIORITY_LIST_DESC (gnutls_cli_opt_strs+3496)
/** Upper-cased name for the priority-list option */
-#define PRIORITY_LIST_NAME (gnutls_cli_opt_strs+3427)
+#define PRIORITY_LIST_NAME (gnutls_cli_opt_strs+3543)
/** Name string for the priority-list option */
-#define PRIORITY_LIST_name (gnutls_cli_opt_strs+3441)
+#define PRIORITY_LIST_name (gnutls_cli_opt_strs+3557)
/** Compiled in flag settings for the priority-list option */
#define PRIORITY_LIST_FLAGS (OPTST_DISABLED)
@@ -854,11 +870,11 @@ static int const aListCantList[] = {
* noticket option description:
*/
/** Descriptive text for the noticket option */
-#define NOTICKET_DESC (gnutls_cli_opt_strs+3455)
+#define NOTICKET_DESC (gnutls_cli_opt_strs+3571)
/** Upper-cased name for the noticket option */
-#define NOTICKET_NAME (gnutls_cli_opt_strs+3483)
+#define NOTICKET_NAME (gnutls_cli_opt_strs+3599)
/** Name string for the noticket option */
-#define NOTICKET_name (gnutls_cli_opt_strs+3492)
+#define NOTICKET_name (gnutls_cli_opt_strs+3608)
/** Compiled in flag settings for the noticket option */
#define NOTICKET_FLAGS (OPTST_DISABLED)
@@ -866,11 +882,11 @@ static int const aListCantList[] = {
* srtp_profiles option description:
*/
/** Descriptive text for the srtp_profiles option */
-#define SRTP_PROFILES_DESC (gnutls_cli_opt_strs+3501)
+#define SRTP_PROFILES_DESC (gnutls_cli_opt_strs+3617)
/** Upper-cased name for the srtp_profiles option */
-#define SRTP_PROFILES_NAME (gnutls_cli_opt_strs+3521)
+#define SRTP_PROFILES_NAME (gnutls_cli_opt_strs+3637)
/** Name string for the srtp_profiles option */
-#define SRTP_PROFILES_name (gnutls_cli_opt_strs+3535)
+#define SRTP_PROFILES_name (gnutls_cli_opt_strs+3651)
/** Compiled in flag settings for the srtp_profiles option */
#define SRTP_PROFILES_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -879,11 +895,11 @@ static int const aListCantList[] = {
* alpn option description:
*/
/** Descriptive text for the alpn option */
-#define ALPN_DESC (gnutls_cli_opt_strs+3549)
+#define ALPN_DESC (gnutls_cli_opt_strs+3665)
/** Upper-cased name for the alpn option */
-#define ALPN_NAME (gnutls_cli_opt_strs+3576)
+#define ALPN_NAME (gnutls_cli_opt_strs+3692)
/** Name string for the alpn option */
-#define ALPN_name (gnutls_cli_opt_strs+3581)
+#define ALPN_name (gnutls_cli_opt_strs+3697)
/** Compiled in flag settings for the alpn option */
#define ALPN_FLAGS (OPTST_DISABLED | OPTST_STACKED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -892,11 +908,11 @@ static int const aListCantList[] = {
* heartbeat option description:
*/
/** Descriptive text for the heartbeat option */
-#define HEARTBEAT_DESC (gnutls_cli_opt_strs+3586)
+#define HEARTBEAT_DESC (gnutls_cli_opt_strs+3702)
/** Upper-cased name for the heartbeat option */
-#define HEARTBEAT_NAME (gnutls_cli_opt_strs+3613)
+#define HEARTBEAT_NAME (gnutls_cli_opt_strs+3729)
/** Name string for the heartbeat option */
-#define HEARTBEAT_name (gnutls_cli_opt_strs+3623)
+#define HEARTBEAT_name (gnutls_cli_opt_strs+3739)
/** Compiled in flag settings for the heartbeat option */
#define HEARTBEAT_FLAGS (OPTST_DISABLED)
@@ -904,11 +920,11 @@ static int const aListCantList[] = {
* recordsize option description:
*/
/** Descriptive text for the recordsize option */
-#define RECORDSIZE_DESC (gnutls_cli_opt_strs+3633)
+#define RECORDSIZE_DESC (gnutls_cli_opt_strs+3749)
/** Upper-cased name for the recordsize option */
-#define RECORDSIZE_NAME (gnutls_cli_opt_strs+3670)
+#define RECORDSIZE_NAME (gnutls_cli_opt_strs+3786)
/** Name string for the recordsize option */
-#define RECORDSIZE_name (gnutls_cli_opt_strs+3681)
+#define RECORDSIZE_name (gnutls_cli_opt_strs+3797)
/** Compiled in flag settings for the recordsize option */
#define RECORDSIZE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -917,11 +933,11 @@ static int const aListCantList[] = {
* disable-sni option description:
*/
/** Descriptive text for the disable-sni option */
-#define DISABLE_SNI_DESC (gnutls_cli_opt_strs+3692)
+#define DISABLE_SNI_DESC (gnutls_cli_opt_strs+3808)
/** Upper-cased name for the disable-sni option */
-#define DISABLE_SNI_NAME (gnutls_cli_opt_strs+3735)
+#define DISABLE_SNI_NAME (gnutls_cli_opt_strs+3851)
/** Name string for the disable-sni option */
-#define DISABLE_SNI_name (gnutls_cli_opt_strs+3747)
+#define DISABLE_SNI_name (gnutls_cli_opt_strs+3863)
/** Compiled in flag settings for the disable-sni option */
#define DISABLE_SNI_FLAGS (OPTST_DISABLED)
@@ -929,11 +945,11 @@ static int const aListCantList[] = {
* disable-extensions option description:
*/
/** Descriptive text for the disable-extensions option */
-#define DISABLE_EXTENSIONS_DESC (gnutls_cli_opt_strs+3759)
+#define DISABLE_EXTENSIONS_DESC (gnutls_cli_opt_strs+3875)
/** Upper-cased name for the disable-extensions option */
-#define DISABLE_EXTENSIONS_NAME (gnutls_cli_opt_strs+3790)
+#define DISABLE_EXTENSIONS_NAME (gnutls_cli_opt_strs+3906)
/** Name string for the disable-extensions option */
-#define DISABLE_EXTENSIONS_name (gnutls_cli_opt_strs+3809)
+#define DISABLE_EXTENSIONS_name (gnutls_cli_opt_strs+3925)
/** Compiled in flag settings for the disable-extensions option */
#define DISABLE_EXTENSIONS_FLAGS (OPTST_DISABLED)
@@ -941,11 +957,11 @@ static int const aListCantList[] = {
* inline-commands option description:
*/
/** Descriptive text for the inline-commands option */
-#define INLINE_COMMANDS_DESC (gnutls_cli_opt_strs+3828)
+#define INLINE_COMMANDS_DESC (gnutls_cli_opt_strs+3944)
/** Upper-cased name for the inline-commands option */
-#define INLINE_COMMANDS_NAME (gnutls_cli_opt_strs+3864)
+#define INLINE_COMMANDS_NAME (gnutls_cli_opt_strs+3980)
/** Name string for the inline-commands option */
-#define INLINE_COMMANDS_name (gnutls_cli_opt_strs+3880)
+#define INLINE_COMMANDS_name (gnutls_cli_opt_strs+3996)
/** Compiled in flag settings for the inline-commands option */
#define INLINE_COMMANDS_FLAGS (OPTST_DISABLED)
@@ -953,11 +969,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+3896)
+#define INLINE_COMMANDS_PREFIX_DESC (gnutls_cli_opt_strs+4012)
/** Upper-cased name for the inline-commands-prefix option */
-#define INLINE_COMMANDS_PREFIX_NAME (gnutls_cli_opt_strs+3946)
+#define INLINE_COMMANDS_PREFIX_NAME (gnutls_cli_opt_strs+4062)
/** Name string for the inline-commands-prefix option */
-#define INLINE_COMMANDS_PREFIX_name (gnutls_cli_opt_strs+3969)
+#define INLINE_COMMANDS_PREFIX_name (gnutls_cli_opt_strs+4085)
/** Compiled in flag settings for the inline-commands-prefix option */
#define INLINE_COMMANDS_PREFIX_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -966,11 +982,11 @@ static int const aListCantList[] = {
* provider option description:
*/
/** Descriptive text for the provider option */
-#define PROVIDER_DESC (gnutls_cli_opt_strs+3992)
+#define PROVIDER_DESC (gnutls_cli_opt_strs+4108)
/** Upper-cased name for the provider option */
-#define PROVIDER_NAME (gnutls_cli_opt_strs+4030)
+#define PROVIDER_NAME (gnutls_cli_opt_strs+4146)
/** Name string for the provider option */
-#define PROVIDER_name (gnutls_cli_opt_strs+4039)
+#define PROVIDER_name (gnutls_cli_opt_strs+4155)
/** Compiled in flag settings for the provider option */
#define PROVIDER_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -979,22 +995,22 @@ static int const aListCantList[] = {
* fips140-mode option description:
*/
/** Descriptive text for the fips140-mode option */
-#define FIPS140_MODE_DESC (gnutls_cli_opt_strs+4048)
+#define FIPS140_MODE_DESC (gnutls_cli_opt_strs+4164)
/** Upper-cased name for the fips140-mode option */
-#define FIPS140_MODE_NAME (gnutls_cli_opt_strs+4107)
+#define FIPS140_MODE_NAME (gnutls_cli_opt_strs+4223)
/** Name string for the fips140-mode option */
-#define FIPS140_MODE_name (gnutls_cli_opt_strs+4120)
+#define FIPS140_MODE_name (gnutls_cli_opt_strs+4236)
/** 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+4133)
-#define HELP_name (gnutls_cli_opt_strs+4177)
+#define HELP_DESC (gnutls_cli_opt_strs+4249)
+#define HELP_name (gnutls_cli_opt_strs+4293)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (gnutls_cli_opt_strs+4182)
-#define MORE_HELP_name (gnutls_cli_opt_strs+4227)
+#define MORE_HELP_DESC (gnutls_cli_opt_strs+4298)
+#define MORE_HELP_name (gnutls_cli_opt_strs+4343)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC HELP_DESC
@@ -1007,8 +1023,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+4237)
-#define VER_name (gnutls_cli_opt_strs+4273)
+#define VER_DESC (gnutls_cli_opt_strs+4353)
+#define VER_name (gnutls_cli_opt_strs+4389)
/**
* Declare option callback procedures
*/
@@ -1150,8 +1166,20 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ REHANDSHAKE_DESC, REHANDSHAKE_NAME, REHANDSHAKE_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 10, VALUE_OPT_STARTTLS,
- /* equiv idx, value */ 10, VALUE_OPT_STARTTLS,
+ { /* entry idx, value */ 10, VALUE_OPT_SNI_HOSTNAME,
+ /* equiv idx, value */ 10, VALUE_OPT_SNI_HOSTNAME,
+ /* equivalenced to */ NO_EQUIVALENT,
+ /* min, max, act ct */ 0, 1, 0,
+ /* opt state flags */ SNI_HOSTNAME_FLAGS, 0,
+ /* last opt argumnt */ { NULL }, /* --sni-hostname */
+ /* arg list/cookie */ NULL,
+ /* must/cannot opts */ NULL, NULL,
+ /* option proc */ NULL,
+ /* desc, NAME, name */ SNI_HOSTNAME_DESC, SNI_HOSTNAME_NAME, SNI_HOSTNAME_name,
+ /* disablement strs */ NULL, NULL },
+
+ { /* entry idx, value */ 11, VALUE_OPT_STARTTLS,
+ /* equiv idx, value */ 11, VALUE_OPT_STARTTLS,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ STARTTLS_FLAGS, 0,
@@ -1162,8 +1190,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ STARTTLS_DESC, STARTTLS_NAME, STARTTLS_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 11, VALUE_OPT_APP_PROTO,
- /* equiv idx, value */ 11, VALUE_OPT_APP_PROTO,
+ { /* entry idx, value */ 12, VALUE_OPT_APP_PROTO,
+ /* equiv idx, value */ 12, VALUE_OPT_APP_PROTO,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ APP_PROTO_FLAGS, 0,
@@ -1174,8 +1202,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ APP_PROTO_DESC, APP_PROTO_NAME, APP_PROTO_name,
/* disablement strs */ 0, 0 },
- { /* entry idx, value */ 12, VALUE_OPT_STARTTLS_PROTO,
- /* equiv idx, value */ 12, VALUE_OPT_STARTTLS_PROTO,
+ { /* entry idx, value */ 13, VALUE_OPT_STARTTLS_PROTO,
+ /* equiv idx, value */ 13, VALUE_OPT_STARTTLS_PROTO,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ STARTTLS_PROTO_FLAGS, 0,
@@ -1186,8 +1214,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ STARTTLS_PROTO_DESC, STARTTLS_PROTO_NAME, STARTTLS_PROTO_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 13, VALUE_OPT_UDP,
- /* equiv idx, value */ 13, VALUE_OPT_UDP,
+ { /* entry idx, value */ 14, VALUE_OPT_UDP,
+ /* equiv idx, value */ 14, VALUE_OPT_UDP,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ UDP_FLAGS, 0,
@@ -1198,8 +1226,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ UDP_DESC, UDP_NAME, UDP_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 14, VALUE_OPT_MTU,
- /* equiv idx, value */ 14, VALUE_OPT_MTU,
+ { /* entry idx, value */ 15, VALUE_OPT_MTU,
+ /* equiv idx, value */ 15, VALUE_OPT_MTU,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ MTU_FLAGS, 0,
@@ -1210,8 +1238,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ MTU_DESC, MTU_NAME, MTU_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 15, VALUE_OPT_CRLF,
- /* equiv idx, value */ 15, VALUE_OPT_CRLF,
+ { /* entry idx, value */ 16, VALUE_OPT_CRLF,
+ /* equiv idx, value */ 16, VALUE_OPT_CRLF,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ CRLF_FLAGS, 0,
@@ -1222,8 +1250,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ CRLF_DESC, CRLF_NAME, CRLF_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 16, VALUE_OPT_FASTOPEN,
- /* equiv idx, value */ 16, VALUE_OPT_FASTOPEN,
+ { /* entry idx, value */ 17, VALUE_OPT_FASTOPEN,
+ /* equiv idx, value */ 17, VALUE_OPT_FASTOPEN,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ FASTOPEN_FLAGS, 0,
@@ -1234,8 +1262,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ FASTOPEN_DESC, FASTOPEN_NAME, FASTOPEN_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 17, VALUE_OPT_X509FMTDER,
- /* equiv idx, value */ 17, VALUE_OPT_X509FMTDER,
+ { /* entry idx, value */ 18, VALUE_OPT_X509FMTDER,
+ /* equiv idx, value */ 18, VALUE_OPT_X509FMTDER,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ X509FMTDER_FLAGS, 0,
@@ -1246,8 +1274,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ X509FMTDER_DESC, X509FMTDER_NAME, X509FMTDER_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 18, VALUE_OPT_FINGERPRINT,
- /* equiv idx, value */ 18, VALUE_OPT_FINGERPRINT,
+ { /* 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,
@@ -1258,8 +1286,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ FINGERPRINT_DESC, FINGERPRINT_NAME, FINGERPRINT_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 19, VALUE_OPT_PRINT_CERT,
- /* equiv idx, value */ 19, VALUE_OPT_PRINT_CERT,
+ { /* entry idx, value */ 20, VALUE_OPT_PRINT_CERT,
+ /* equiv idx, value */ 20, VALUE_OPT_PRINT_CERT,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ PRINT_CERT_FLAGS, 0,
@@ -1270,8 +1298,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 */ 20, VALUE_OPT_SAVE_CERT,
- /* equiv idx, value */ 20, VALUE_OPT_SAVE_CERT,
+ { /* entry idx, value */ 21, VALUE_OPT_SAVE_CERT,
+ /* equiv idx, value */ 21, VALUE_OPT_SAVE_CERT,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ SAVE_CERT_FLAGS, 0,
@@ -1282,8 +1310,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 */ 21, VALUE_OPT_SAVE_OCSP,
- /* equiv idx, value */ 21, VALUE_OPT_SAVE_OCSP,
+ { /* entry idx, value */ 22, VALUE_OPT_SAVE_OCSP,
+ /* equiv idx, value */ 22, VALUE_OPT_SAVE_OCSP,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ SAVE_OCSP_FLAGS, 0,
@@ -1294,8 +1322,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 */ 22, VALUE_OPT_DH_BITS,
- /* equiv idx, value */ 22, VALUE_OPT_DH_BITS,
+ { /* entry idx, value */ 23, VALUE_OPT_DH_BITS,
+ /* equiv idx, value */ 23, VALUE_OPT_DH_BITS,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ DH_BITS_FLAGS, 0,
@@ -1306,8 +1334,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 */ 23, VALUE_OPT_PRIORITY,
- /* equiv idx, value */ 23, VALUE_OPT_PRIORITY,
+ { /* entry idx, value */ 24, VALUE_OPT_PRIORITY,
+ /* equiv idx, value */ 24, VALUE_OPT_PRIORITY,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ PRIORITY_FLAGS, 0,
@@ -1318,8 +1346,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ PRIORITY_DESC, PRIORITY_NAME, PRIORITY_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 24, VALUE_OPT_X509CAFILE,
- /* equiv idx, value */ 24, VALUE_OPT_X509CAFILE,
+ { /* entry idx, value */ 25, VALUE_OPT_X509CAFILE,
+ /* equiv idx, value */ 25, VALUE_OPT_X509CAFILE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ X509CAFILE_FLAGS, 0,
@@ -1330,8 +1358,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ X509CAFILE_DESC, X509CAFILE_NAME, X509CAFILE_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 25, VALUE_OPT_X509CRLFILE,
- /* equiv idx, value */ 25, VALUE_OPT_X509CRLFILE,
+ { /* entry idx, value */ 26, VALUE_OPT_X509CRLFILE,
+ /* equiv idx, value */ 26, VALUE_OPT_X509CRLFILE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ X509CRLFILE_FLAGS, 0,
@@ -1342,8 +1370,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ X509CRLFILE_DESC, X509CRLFILE_NAME, X509CRLFILE_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 26, VALUE_OPT_PGPKEYFILE,
- /* equiv idx, value */ 26, VALUE_OPT_PGPKEYFILE,
+ { /* 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,
@@ -1354,8 +1382,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ PGPKEYFILE_DESC, PGPKEYFILE_NAME, PGPKEYFILE_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 27, VALUE_OPT_PGPKEYRING,
- /* equiv idx, value */ 27, VALUE_OPT_PGPKEYRING,
+ { /* 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,
@@ -1366,8 +1394,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ PGPKEYRING_DESC, PGPKEYRING_NAME, PGPKEYRING_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 28, VALUE_OPT_PGPCERTFILE,
- /* equiv idx, value */ 28, VALUE_OPT_PGPCERTFILE,
+ { /* 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,
@@ -1378,8 +1406,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ PGPCERTFILE_DESC, PGPCERTFILE_NAME, PGPCERTFILE_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 29, VALUE_OPT_X509KEYFILE,
- /* equiv idx, value */ 29, VALUE_OPT_X509KEYFILE,
+ { /* entry idx, value */ 30, VALUE_OPT_X509KEYFILE,
+ /* equiv idx, value */ 30, VALUE_OPT_X509KEYFILE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ X509KEYFILE_FLAGS, 0,
@@ -1390,8 +1418,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ X509KEYFILE_DESC, X509KEYFILE_NAME, X509KEYFILE_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 30, VALUE_OPT_X509CERTFILE,
- /* equiv idx, value */ 30, VALUE_OPT_X509CERTFILE,
+ { /* entry idx, value */ 31, VALUE_OPT_X509CERTFILE,
+ /* equiv idx, value */ 31, VALUE_OPT_X509CERTFILE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ X509CERTFILE_FLAGS, 0,
@@ -1402,8 +1430,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ X509CERTFILE_DESC, X509CERTFILE_NAME, X509CERTFILE_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 31, VALUE_OPT_PGPSUBKEY,
- /* equiv idx, value */ 31, VALUE_OPT_PGPSUBKEY,
+ { /* 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,
@@ -1414,8 +1442,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ PGPSUBKEY_DESC, PGPSUBKEY_NAME, PGPSUBKEY_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 32, VALUE_OPT_SRPUSERNAME,
- /* equiv idx, value */ 32, VALUE_OPT_SRPUSERNAME,
+ { /* entry idx, value */ 33, VALUE_OPT_SRPUSERNAME,
+ /* equiv idx, value */ 33, VALUE_OPT_SRPUSERNAME,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ SRPUSERNAME_FLAGS, 0,
@@ -1426,8 +1454,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ SRPUSERNAME_DESC, SRPUSERNAME_NAME, SRPUSERNAME_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 33, VALUE_OPT_SRPPASSWD,
- /* equiv idx, value */ 33, VALUE_OPT_SRPPASSWD,
+ { /* entry idx, value */ 34, VALUE_OPT_SRPPASSWD,
+ /* equiv idx, value */ 34, VALUE_OPT_SRPPASSWD,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ SRPPASSWD_FLAGS, 0,
@@ -1438,8 +1466,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ SRPPASSWD_DESC, SRPPASSWD_NAME, SRPPASSWD_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 34, VALUE_OPT_PSKUSERNAME,
- /* equiv idx, value */ 34, VALUE_OPT_PSKUSERNAME,
+ { /* entry idx, value */ 35, VALUE_OPT_PSKUSERNAME,
+ /* equiv idx, value */ 35, VALUE_OPT_PSKUSERNAME,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ PSKUSERNAME_FLAGS, 0,
@@ -1450,8 +1478,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ PSKUSERNAME_DESC, PSKUSERNAME_NAME, PSKUSERNAME_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 35, VALUE_OPT_PSKKEY,
- /* equiv idx, value */ 35, VALUE_OPT_PSKKEY,
+ { /* entry idx, value */ 36, VALUE_OPT_PSKKEY,
+ /* equiv idx, value */ 36, VALUE_OPT_PSKKEY,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ PSKKEY_FLAGS, 0,
@@ -1462,8 +1490,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ PSKKEY_DESC, PSKKEY_NAME, PSKKEY_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 36, VALUE_OPT_PORT,
- /* equiv idx, value */ 36, VALUE_OPT_PORT,
+ { /* entry idx, value */ 37, VALUE_OPT_PORT,
+ /* equiv idx, value */ 37, VALUE_OPT_PORT,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ PORT_FLAGS, 0,
@@ -1474,8 +1502,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_INSECURE,
- /* equiv idx, value */ 37, VALUE_OPT_INSECURE,
+ { /* entry idx, value */ 38, VALUE_OPT_INSECURE,
+ /* equiv idx, value */ 38, VALUE_OPT_INSECURE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ INSECURE_FLAGS, 0,
@@ -1486,8 +1514,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ INSECURE_DESC, INSECURE_NAME, INSECURE_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 38, VALUE_OPT_RANGES,
- /* equiv idx, value */ 38, VALUE_OPT_RANGES,
+ { /* entry idx, value */ 39, VALUE_OPT_RANGES,
+ /* equiv idx, value */ 39, VALUE_OPT_RANGES,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ RANGES_FLAGS, 0,
@@ -1498,8 +1526,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ RANGES_DESC, RANGES_NAME, RANGES_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 39, VALUE_OPT_BENCHMARK_CIPHERS,
- /* equiv idx, value */ 39, VALUE_OPT_BENCHMARK_CIPHERS,
+ { /* entry idx, value */ 40, VALUE_OPT_BENCHMARK_CIPHERS,
+ /* equiv idx, value */ 40, VALUE_OPT_BENCHMARK_CIPHERS,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ BENCHMARK_CIPHERS_FLAGS, 0,
@@ -1510,8 +1538,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 */ 40, VALUE_OPT_BENCHMARK_TLS_KX,
- /* equiv idx, value */ 40, VALUE_OPT_BENCHMARK_TLS_KX,
+ { /* entry idx, value */ 41, VALUE_OPT_BENCHMARK_TLS_KX,
+ /* equiv idx, value */ 41, VALUE_OPT_BENCHMARK_TLS_KX,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ BENCHMARK_TLS_KX_FLAGS, 0,
@@ -1522,8 +1550,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 */ 41, VALUE_OPT_BENCHMARK_TLS_CIPHERS,
- /* equiv idx, value */ 41, VALUE_OPT_BENCHMARK_TLS_CIPHERS,
+ { /* entry idx, value */ 42, VALUE_OPT_BENCHMARK_TLS_CIPHERS,
+ /* equiv idx, value */ 42, VALUE_OPT_BENCHMARK_TLS_CIPHERS,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ BENCHMARK_TLS_CIPHERS_FLAGS, 0,
@@ -1534,8 +1562,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 */ 42, VALUE_OPT_LIST,
- /* equiv idx, value */ 42, VALUE_OPT_LIST,
+ { /* entry idx, value */ 43, VALUE_OPT_LIST,
+ /* equiv idx, value */ 43, VALUE_OPT_LIST,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ LIST_FLAGS, 0,
@@ -1546,8 +1574,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ LIST_DESC, LIST_NAME, LIST_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 43, VALUE_OPT_PRIORITY_LIST,
- /* equiv idx, value */ 43, VALUE_OPT_PRIORITY_LIST,
+ { /* entry idx, value */ 44, VALUE_OPT_PRIORITY_LIST,
+ /* equiv idx, value */ 44, VALUE_OPT_PRIORITY_LIST,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ PRIORITY_LIST_FLAGS, 0,
@@ -1558,8 +1586,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 */ 44, VALUE_OPT_NOTICKET,
- /* equiv idx, value */ 44, VALUE_OPT_NOTICKET,
+ { /* entry idx, value */ 45, VALUE_OPT_NOTICKET,
+ /* equiv idx, value */ 45, VALUE_OPT_NOTICKET,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ NOTICKET_FLAGS, 0,
@@ -1570,8 +1598,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ NOTICKET_DESC, NOTICKET_NAME, NOTICKET_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 45, VALUE_OPT_SRTP_PROFILES,
- /* equiv idx, value */ 45, VALUE_OPT_SRTP_PROFILES,
+ { /* entry idx, value */ 46, VALUE_OPT_SRTP_PROFILES,
+ /* equiv idx, value */ 46, VALUE_OPT_SRTP_PROFILES,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ SRTP_PROFILES_FLAGS, 0,
@@ -1582,8 +1610,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 */ 46, VALUE_OPT_ALPN,
- /* equiv idx, value */ 46, VALUE_OPT_ALPN,
+ { /* entry idx, value */ 47, VALUE_OPT_ALPN,
+ /* equiv idx, value */ 47, VALUE_OPT_ALPN,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, NOLIMIT, 0,
/* opt state flags */ ALPN_FLAGS, 0,
@@ -1594,8 +1622,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ ALPN_DESC, ALPN_NAME, ALPN_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 47, VALUE_OPT_HEARTBEAT,
- /* equiv idx, value */ 47, VALUE_OPT_HEARTBEAT,
+ { /* entry idx, value */ 48, VALUE_OPT_HEARTBEAT,
+ /* equiv idx, value */ 48, VALUE_OPT_HEARTBEAT,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ HEARTBEAT_FLAGS, 0,
@@ -1606,8 +1634,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ HEARTBEAT_DESC, HEARTBEAT_NAME, HEARTBEAT_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 48, VALUE_OPT_RECORDSIZE,
- /* equiv idx, value */ 48, VALUE_OPT_RECORDSIZE,
+ { /* entry idx, value */ 49, VALUE_OPT_RECORDSIZE,
+ /* equiv idx, value */ 49, VALUE_OPT_RECORDSIZE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ RECORDSIZE_FLAGS, 0,
@@ -1618,8 +1646,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ RECORDSIZE_DESC, RECORDSIZE_NAME, RECORDSIZE_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 49, VALUE_OPT_DISABLE_SNI,
- /* equiv idx, value */ 49, VALUE_OPT_DISABLE_SNI,
+ { /* entry idx, value */ 50, VALUE_OPT_DISABLE_SNI,
+ /* equiv idx, value */ 50, VALUE_OPT_DISABLE_SNI,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ DISABLE_SNI_FLAGS, 0,
@@ -1630,8 +1658,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 */ 50, VALUE_OPT_DISABLE_EXTENSIONS,
- /* equiv idx, value */ 50, VALUE_OPT_DISABLE_EXTENSIONS,
+ { /* entry idx, value */ 51, VALUE_OPT_DISABLE_EXTENSIONS,
+ /* equiv idx, value */ 51, VALUE_OPT_DISABLE_EXTENSIONS,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ DISABLE_EXTENSIONS_FLAGS, 0,
@@ -1642,8 +1670,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 */ 51, VALUE_OPT_INLINE_COMMANDS,
- /* equiv idx, value */ 51, VALUE_OPT_INLINE_COMMANDS,
+ { /* entry idx, value */ 52, VALUE_OPT_INLINE_COMMANDS,
+ /* equiv idx, value */ 52, VALUE_OPT_INLINE_COMMANDS,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ INLINE_COMMANDS_FLAGS, 0,
@@ -1654,8 +1682,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ INLINE_COMMANDS_DESC, INLINE_COMMANDS_NAME, INLINE_COMMANDS_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 52, VALUE_OPT_INLINE_COMMANDS_PREFIX,
- /* equiv idx, value */ 52, VALUE_OPT_INLINE_COMMANDS_PREFIX,
+ { /* entry idx, value */ 53, VALUE_OPT_INLINE_COMMANDS_PREFIX,
+ /* equiv idx, value */ 53, VALUE_OPT_INLINE_COMMANDS_PREFIX,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ INLINE_COMMANDS_PREFIX_FLAGS, 0,
@@ -1666,8 +1694,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ INLINE_COMMANDS_PREFIX_DESC, INLINE_COMMANDS_PREFIX_NAME, INLINE_COMMANDS_PREFIX_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 53, VALUE_OPT_PROVIDER,
- /* equiv idx, value */ 53, VALUE_OPT_PROVIDER,
+ { /* entry idx, value */ 54, VALUE_OPT_PROVIDER,
+ /* equiv idx, value */ 54, VALUE_OPT_PROVIDER,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ PROVIDER_FLAGS, 0,
@@ -1678,8 +1706,8 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ PROVIDER_DESC, PROVIDER_NAME, PROVIDER_name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 54, VALUE_OPT_FIPS140_MODE,
- /* equiv idx, value */ 54, VALUE_OPT_FIPS140_MODE,
+ { /* entry idx, value */ 55, VALUE_OPT_FIPS140_MODE,
+ /* equiv idx, value */ 55, VALUE_OPT_FIPS140_MODE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ FIPS140_MODE_FLAGS, 0,
@@ -1732,21 +1760,21 @@ static tOptDesc optDesc[OPTION_CT] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/** Reference to the upper cased version of gnutls-cli. */
-#define zPROGNAME (gnutls_cli_opt_strs+4281)
+#define zPROGNAME (gnutls_cli_opt_strs+4397)
/** Reference to the title line for gnutls-cli usage. */
-#define zUsageTitle (gnutls_cli_opt_strs+4292)
+#define zUsageTitle (gnutls_cli_opt_strs+4408)
/** 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+4388)
+#define zBugsAddr (gnutls_cli_opt_strs+4504)
/** Clarification/explanation of what gnutls-cli does. */
-#define zExplain (gnutls_cli_opt_strs+4408)
+#define zExplain (gnutls_cli_opt_strs+4524)
/** Extra detail explaining what gnutls-cli does. */
-#define zDetail (gnutls_cli_opt_strs+4410)
+#define zDetail (gnutls_cli_opt_strs+4526)
/** The full version string for gnutls-cli. */
-#define zFullVersion (gnutls_cli_opt_strs+4593)
+#define zFullVersion (gnutls_cli_opt_strs+4709)
/* extracted from optcode.tlib near line 364 */
#if defined(ENABLE_NLS)
@@ -1758,7 +1786,7 @@ static tOptDesc optDesc[OPTION_CT] = {
#endif /* ENABLE_NLS */
#define gnutls_cli_full_usage (NULL)
-#define gnutls_cli_short_usage (gnutls_cli_opt_strs+4614)
+#define gnutls_cli_short_usage (gnutls_cli_opt_strs+4730)
#endif /* not defined __doxygen__ */
@@ -2089,7 +2117,7 @@ tOptions gnutls_cliOptions = {
NO_EQUIVALENT, /* '-#' option index */
NO_EQUIVALENT /* index of default opt */
},
- 58 /* full option count */, 55 /* user option count */,
+ 59 /* full option count */, 56 /* user option count */,
gnutls_cli_full_usage, gnutls_cli_short_usage,
NULL, NULL,
PKGDATADIR, gnutls_cli_packager_info
@@ -2273,6 +2301,9 @@ with this program. If not, see <http://www.gnu.org/licenses/>.\n"));
puts(_("Establish a session and rehandshake"));
/* referenced via gnutls_cliOptions.pOptDesc->pzText */
+ puts(_("Server's hostname for server name indication extension"));
+
+ /* referenced via gnutls_cliOptions.pOptDesc->pzText */
puts(_("Connect, establish a plain session and start TLS"));
/* referenced via gnutls_cliOptions.pOptDesc->pzText */
@@ -2280,7 +2311,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.\n"));
/* referenced via gnutls_cliOptions.pOptDesc->pzText */
puts(_("The application protocol to be used to obtain the server's certificate\n\
-(https, ftp, smtp, imap, ldap, xmpp)"));
+(https, ftp, smtp, imap, ldap, xmpp, lmtp, pop3, nntp, sieve, postgres)"));
/* referenced via gnutls_cliOptions.pOptDesc->pzText */
puts(_("Use DTLS (datagram TLS) over UDP"));
diff --git a/src/cli-args.h.bak b/src/cli-args.h.bak
index 01f81c93e9..b7edc1d99a 100644
--- a/src/cli-args.h.bak
+++ b/src/cli-args.h.bak
@@ -76,57 +76,58 @@ typedef enum {
INDEX_OPT_OCSP = 7,
INDEX_OPT_RESUME = 8,
INDEX_OPT_REHANDSHAKE = 9,
- INDEX_OPT_STARTTLS = 10,
- INDEX_OPT_APP_PROTO = 11,
- INDEX_OPT_STARTTLS_PROTO = 12,
- INDEX_OPT_UDP = 13,
- INDEX_OPT_MTU = 14,
- INDEX_OPT_CRLF = 15,
- INDEX_OPT_FASTOPEN = 16,
- INDEX_OPT_X509FMTDER = 17,
- INDEX_OPT_FINGERPRINT = 18,
- 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_PGPKEYFILE = 26,
- INDEX_OPT_PGPKEYRING = 27,
- INDEX_OPT_PGPCERTFILE = 28,
- INDEX_OPT_X509KEYFILE = 29,
- INDEX_OPT_X509CERTFILE = 30,
- INDEX_OPT_PGPSUBKEY = 31,
- INDEX_OPT_SRPUSERNAME = 32,
- INDEX_OPT_SRPPASSWD = 33,
- INDEX_OPT_PSKUSERNAME = 34,
- INDEX_OPT_PSKKEY = 35,
- INDEX_OPT_PORT = 36,
- INDEX_OPT_INSECURE = 37,
- INDEX_OPT_RANGES = 38,
- INDEX_OPT_BENCHMARK_CIPHERS = 39,
- INDEX_OPT_BENCHMARK_TLS_KX = 40,
- INDEX_OPT_BENCHMARK_TLS_CIPHERS = 41,
- INDEX_OPT_LIST = 42,
- INDEX_OPT_PRIORITY_LIST = 43,
- INDEX_OPT_NOTICKET = 44,
- INDEX_OPT_SRTP_PROFILES = 45,
- INDEX_OPT_ALPN = 46,
- INDEX_OPT_HEARTBEAT = 47,
- INDEX_OPT_RECORDSIZE = 48,
- INDEX_OPT_DISABLE_SNI = 49,
- INDEX_OPT_DISABLE_EXTENSIONS = 50,
- INDEX_OPT_INLINE_COMMANDS = 51,
- INDEX_OPT_INLINE_COMMANDS_PREFIX = 52,
- INDEX_OPT_PROVIDER = 53,
- INDEX_OPT_FIPS140_MODE = 54,
- INDEX_OPT_VERSION = 55,
- INDEX_OPT_HELP = 56,
- INDEX_OPT_MORE_HELP = 57
+ INDEX_OPT_SNI_HOSTNAME = 10,
+ INDEX_OPT_STARTTLS = 11,
+ INDEX_OPT_APP_PROTO = 12,
+ INDEX_OPT_STARTTLS_PROTO = 13,
+ INDEX_OPT_UDP = 14,
+ INDEX_OPT_MTU = 15,
+ 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
} teOptIndex;
/** count of all options for gnutls-cli */
-#define OPTION_CT 58
+#define OPTION_CT 59
/** gnutls-cli version */
#define GNUTLS_CLI_VERSION "@VERSION@"
/** Full gnutls-cli version text */
@@ -193,57 +194,58 @@ typedef enum {
#define VALUE_OPT_OCSP 0x1006
#define VALUE_OPT_RESUME 'r'
#define VALUE_OPT_REHANDSHAKE 'e'
+#define VALUE_OPT_SNI_HOSTNAME 0x1007
#define VALUE_OPT_STARTTLS 's'
-#define VALUE_OPT_APP_PROTO 0x1007
-#define VALUE_OPT_STARTTLS_PROTO 0x1008
+#define VALUE_OPT_APP_PROTO 0x1008
+#define VALUE_OPT_STARTTLS_PROTO 0x1009
#define VALUE_OPT_UDP 'u'
-#define VALUE_OPT_MTU 0x1009
+#define VALUE_OPT_MTU 0x100A
#define OPT_VALUE_MTU (DESC(MTU).optArg.argInt)
-#define VALUE_OPT_CRLF 0x100A
-#define VALUE_OPT_FASTOPEN 0x100B
-#define VALUE_OPT_X509FMTDER 0x100C
+#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 0x100D
-#define VALUE_OPT_SAVE_CERT 0x100E
-#define VALUE_OPT_SAVE_OCSP 0x100F
-#define VALUE_OPT_DH_BITS 0x1010
+#define VALUE_OPT_PRINT_CERT 0x100E
+#define VALUE_OPT_SAVE_CERT 0x100F
+#define VALUE_OPT_SAVE_OCSP 0x1010
+#define VALUE_OPT_DH_BITS 0x1011
#define OPT_VALUE_DH_BITS (DESC(DH_BITS).optArg.argInt)
-#define VALUE_OPT_PRIORITY 0x1011
-#define VALUE_OPT_X509CAFILE 0x1012
-#define VALUE_OPT_X509CRLFILE 0x1013
-#define VALUE_OPT_PGPKEYFILE 0x1014
-#define VALUE_OPT_PGPKEYRING 0x1015
-#define VALUE_OPT_PGPCERTFILE 0x1016
-#define VALUE_OPT_X509KEYFILE 0x1017
-#define VALUE_OPT_X509CERTFILE 0x1018
-#define VALUE_OPT_PGPSUBKEY 0x1019
-#define VALUE_OPT_SRPUSERNAME 0x101A
-#define VALUE_OPT_SRPPASSWD 0x101B
-#define VALUE_OPT_PSKUSERNAME 0x101C
-#define VALUE_OPT_PSKKEY 0x101D
+#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_PORT 'p'
-#define VALUE_OPT_INSECURE 0x101E
-#define VALUE_OPT_RANGES 0x101F
-#define VALUE_OPT_BENCHMARK_CIPHERS 0x1020
-#define VALUE_OPT_BENCHMARK_TLS_KX 0x1021
-#define VALUE_OPT_BENCHMARK_TLS_CIPHERS 0x1022
+#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_LIST 'l'
-#define VALUE_OPT_PRIORITY_LIST 0x1023
-#define VALUE_OPT_NOTICKET 0x1024
-#define VALUE_OPT_SRTP_PROFILES 0x1025
-#define VALUE_OPT_ALPN 0x1026
+#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_HEARTBEAT 'b'
-#define VALUE_OPT_RECORDSIZE 0x1027
+#define VALUE_OPT_RECORDSIZE 0x1028
#define OPT_VALUE_RECORDSIZE (DESC(RECORDSIZE).optArg.argInt)
-#define VALUE_OPT_DISABLE_SNI 0x1028
-#define VALUE_OPT_DISABLE_EXTENSIONS 0x1029
-#define VALUE_OPT_INLINE_COMMANDS 0x102A
-#define VALUE_OPT_INLINE_COMMANDS_PREFIX 0x102B
-#define VALUE_OPT_PROVIDER 0x102C
-#define VALUE_OPT_FIPS140_MODE 0x102D
+#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
/** 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-debug-args.c.bak b/src/cli-debug-args.c.bak
index 3263a10797..855af2e180 100644
--- a/src/cli-debug-args.c.bak
+++ b/src/cli-debug-args.c.bak
@@ -63,7 +63,7 @@ extern FILE * option_usage_fp;
/**
* static const strings for gnutls-cli-debug options
*/
-static char const gnutls_cli_debug_opt_strs[2021] =
+static char const gnutls_cli_debug_opt_strs[2056] =
/* 0 */ "gnutls-cli-debug @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"
@@ -91,28 +91,28 @@ static char const gnutls_cli_debug_opt_strs[2021] =
/* 1016 */ "an alias for the 'starttls-proto' option\0"
/* 1057 */ "app-proto\0"
/* 1067 */ "The application protocol to be used to obtain the server's certificate\n"
- "(https, ftp, smtp, imap, ldap, xmpp)\0"
-/* 1175 */ "STARTTLS_PROTO\0"
-/* 1190 */ "starttls-proto\0"
-/* 1205 */ "display extended usage information and exit\0"
-/* 1249 */ "help\0"
-/* 1254 */ "extended usage information passed thru pager\0"
-/* 1299 */ "more-help\0"
-/* 1309 */ "output version information and exit\0"
-/* 1345 */ "version\0"
-/* 1353 */ "GNUTLS_CLI_DEBUG\0"
-/* 1370 */ "gnutls-cli-debug - GnuTLS debug client\n"
+ "(https, ftp, smtp, imap, ldap, xmpp, lmtp, pop3, nntp, sieve, postgres)\0"
+/* 1210 */ "STARTTLS_PROTO\0"
+/* 1225 */ "starttls-proto\0"
+/* 1240 */ "display extended usage information and exit\0"
+/* 1284 */ "help\0"
+/* 1289 */ "extended usage information passed thru pager\0"
+/* 1334 */ "more-help\0"
+/* 1344 */ "output version information and exit\0"
+/* 1380 */ "version\0"
+/* 1388 */ "GNUTLS_CLI_DEBUG\0"
+/* 1405 */ "gnutls-cli-debug - GnuTLS debug client\n"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \n\0"
-/* 1468 */ "@PACKAGE_BUGREPORT@\0"
-/* 1488 */ "\n\0"
-/* 1490 */ "TLS debug client. It sets up multiple TLS connections to a server and\n"
+/* 1503 */ "@PACKAGE_BUGREPORT@\0"
+/* 1523 */ "\n\0"
+/* 1525 */ "TLS debug client. It sets up multiple TLS connections to a server and\n"
"queries its capabilities. It was created to assist in debugging GnuTLS,\n"
"but it might be useful to extract a TLS server's capabilities. It connects\n"
"to a TLS server, performs tests and print the server's capabilities. If\n"
"called with the `-v' parameter more checks will be performed. Can be used\n"
"to check for servers with special needs or bugs.\n\0"
-/* 1908 */ "gnutls-cli-debug @VERSION@\0"
-/* 1935 */ "Usage: gnutls-cli-debug [options] hostname\n"
+/* 1943 */ "gnutls-cli-debug @VERSION@\0"
+/* 1970 */ "Usage: gnutls-cli-debug [options] hostname\n"
"gnutls-cli --help for usage instructions.\n";
/**
@@ -170,9 +170,9 @@ static char const gnutls_cli_debug_opt_strs[2021] =
/** Descriptive text for the starttls-proto option */
#define STARTTLS_PROTO_DESC (gnutls_cli_debug_opt_strs+1067)
/** Upper-cased name for the starttls-proto option */
-#define STARTTLS_PROTO_NAME (gnutls_cli_debug_opt_strs+1175)
+#define STARTTLS_PROTO_NAME (gnutls_cli_debug_opt_strs+1210)
/** Name string for the starttls-proto option */
-#define STARTTLS_PROTO_name (gnutls_cli_debug_opt_strs+1190)
+#define STARTTLS_PROTO_name (gnutls_cli_debug_opt_strs+1225)
/** Compiled in flag settings for the starttls-proto option */
#define STARTTLS_PROTO_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -180,11 +180,11 @@ static char const gnutls_cli_debug_opt_strs[2021] =
/*
* Help/More_Help/Version option descriptions:
*/
-#define HELP_DESC (gnutls_cli_debug_opt_strs+1205)
-#define HELP_name (gnutls_cli_debug_opt_strs+1249)
+#define HELP_DESC (gnutls_cli_debug_opt_strs+1240)
+#define HELP_name (gnutls_cli_debug_opt_strs+1284)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (gnutls_cli_debug_opt_strs+1254)
-#define MORE_HELP_name (gnutls_cli_debug_opt_strs+1299)
+#define MORE_HELP_DESC (gnutls_cli_debug_opt_strs+1289)
+#define MORE_HELP_name (gnutls_cli_debug_opt_strs+1334)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC HELP_DESC
@@ -197,8 +197,8 @@ static char const gnutls_cli_debug_opt_strs[2021] =
# define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
#endif
-#define VER_DESC (gnutls_cli_debug_opt_strs+1309)
-#define VER_name (gnutls_cli_debug_opt_strs+1345)
+#define VER_DESC (gnutls_cli_debug_opt_strs+1344)
+#define VER_name (gnutls_cli_debug_opt_strs+1380)
/**
* Declare option callback procedures
*/
@@ -320,21 +320,21 @@ static tOptDesc optDesc[OPTION_CT] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/** Reference to the upper cased version of gnutls-cli-debug. */
-#define zPROGNAME (gnutls_cli_debug_opt_strs+1353)
+#define zPROGNAME (gnutls_cli_debug_opt_strs+1388)
/** Reference to the title line for gnutls-cli-debug usage. */
-#define zUsageTitle (gnutls_cli_debug_opt_strs+1370)
+#define zUsageTitle (gnutls_cli_debug_opt_strs+1405)
/** There is no gnutls-cli-debug configuration file. */
#define zRcName NULL
/** There are no directories to search for gnutls-cli-debug config files. */
#define apzHomeList NULL
/** The gnutls-cli-debug program bug email address. */
-#define zBugsAddr (gnutls_cli_debug_opt_strs+1468)
+#define zBugsAddr (gnutls_cli_debug_opt_strs+1503)
/** Clarification/explanation of what gnutls-cli-debug does. */
-#define zExplain (gnutls_cli_debug_opt_strs+1488)
+#define zExplain (gnutls_cli_debug_opt_strs+1523)
/** Extra detail explaining what gnutls-cli-debug does. */
-#define zDetail (gnutls_cli_debug_opt_strs+1490)
+#define zDetail (gnutls_cli_debug_opt_strs+1525)
/** The full version string for gnutls-cli-debug. */
-#define zFullVersion (gnutls_cli_debug_opt_strs+1908)
+#define zFullVersion (gnutls_cli_debug_opt_strs+1943)
/* extracted from optcode.tlib near line 364 */
#if defined(ENABLE_NLS)
@@ -346,7 +346,7 @@ static tOptDesc optDesc[OPTION_CT] = {
#endif /* ENABLE_NLS */
#define gnutls_cli_debug_full_usage (NULL)
-#define gnutls_cli_debug_short_usage (gnutls_cli_debug_opt_strs+1935)
+#define gnutls_cli_debug_short_usage (gnutls_cli_debug_opt_strs+1970)
#endif /* not defined __doxygen__ */
@@ -689,7 +689,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.\n"));
/* referenced via gnutls_cli_debugOptions.pOptDesc->pzText */
puts(_("The application protocol to be used to obtain the server's certificate\n\
-(https, ftp, smtp, imap, ldap, xmpp)"));
+(https, ftp, smtp, imap, ldap, xmpp, lmtp, pop3, nntp, sieve, postgres)"));
/* referenced via gnutls_cli_debugOptions.pOptDesc->pzText */
puts(_("display extended usage information and exit"));
diff --git a/src/danetool-args.c.bak b/src/danetool-args.c.bak
index 066f6d2d66..b4d2cd803c 100644
--- a/src/danetool-args.c.bak
+++ b/src/danetool-args.c.bak
@@ -63,7 +63,7 @@ extern FILE * option_usage_fp;
/**
* static const strings for danetool options
*/
-static char const danetool_opt_strs[2849] =
+static char const danetool_opt_strs[2884] =
/* 0 */ "danetool @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"
@@ -127,53 +127,53 @@ static char const danetool_opt_strs[2849] =
/* 1583 */ "an alias for the 'starttls-proto' option\0"
/* 1624 */ "app-proto\0"
/* 1634 */ "The application protocol to be used to obtain the server's certificate\n"
- "(https, ftp, smtp, imap, ldap, xmpp)\0"
-/* 1742 */ "STARTTLS_PROTO\0"
-/* 1757 */ "starttls-proto\0"
-/* 1772 */ "Whether the provided certificate or public key is a Certificate\n"
+ "(https, ftp, smtp, imap, ldap, xmpp, lmtp, pop3, nntp, sieve, postgres)\0"
+/* 1777 */ "STARTTLS_PROTO\0"
+/* 1792 */ "starttls-proto\0"
+/* 1807 */ "Whether the provided certificate or public key is a Certificate\n"
"Authority\0"
-/* 1846 */ "CA\0"
-/* 1849 */ "ca\0"
-/* 1852 */ "Use the hash of the X.509 certificate, rather than the public key\0"
-/* 1918 */ "X509\0"
-/* 1923 */ "x509\0"
-/* 1928 */ "an alias for the 'domain' option\0"
-/* 1961 */ "local\0"
-/* 1967 */ "The provided certificate or public key is issued by the local domain\0"
-/* 2036 */ "DOMAIN\0"
-/* 2043 */ "no-domain\0"
-/* 2053 */ "no\0"
-/* 2056 */ "Use the local DNS server for DNSSEC resolving\0"
-/* 2102 */ "LOCAL_DNS\0"
-/* 2112 */ "no-local-dns\0"
-/* 2125 */ "Do not verify any DNSSEC signature\0"
-/* 2160 */ "INSECURE\0"
-/* 2169 */ "insecure\0"
-/* 2178 */ "Use DER format for input certificates and private keys\0"
-/* 2233 */ "INDER\0"
-/* 2239 */ "no-inder\0"
-/* 2248 */ "an alias for the 'inder' option\0"
-/* 2280 */ "inraw\0"
-/* 2286 */ "Print the received DANE data in raw format\0"
-/* 2329 */ "PRINT_RAW\0"
-/* 2339 */ "no-print-raw\0"
-/* 2352 */ "Suppress several informational messages\0"
-/* 2392 */ "QUIET\0"
-/* 2398 */ "quiet\0"
-/* 2404 */ "display extended usage information and exit\0"
-/* 2448 */ "help\0"
-/* 2453 */ "extended usage information passed thru pager\0"
-/* 2498 */ "more-help\0"
-/* 2508 */ "output version information and exit\0"
-/* 2544 */ "version\0"
-/* 2552 */ "DANETOOL\0"
-/* 2561 */ "danetool - GnuTLS DANE tool\n"
+/* 1881 */ "CA\0"
+/* 1884 */ "ca\0"
+/* 1887 */ "Use the hash of the X.509 certificate, rather than the public key\0"
+/* 1953 */ "X509\0"
+/* 1958 */ "x509\0"
+/* 1963 */ "an alias for the 'domain' option\0"
+/* 1996 */ "local\0"
+/* 2002 */ "The provided certificate or public key is issued by the local domain\0"
+/* 2071 */ "DOMAIN\0"
+/* 2078 */ "no-domain\0"
+/* 2088 */ "no\0"
+/* 2091 */ "Use the local DNS server for DNSSEC resolving\0"
+/* 2137 */ "LOCAL_DNS\0"
+/* 2147 */ "no-local-dns\0"
+/* 2160 */ "Do not verify any DNSSEC signature\0"
+/* 2195 */ "INSECURE\0"
+/* 2204 */ "insecure\0"
+/* 2213 */ "Use DER format for input certificates and private keys\0"
+/* 2268 */ "INDER\0"
+/* 2274 */ "no-inder\0"
+/* 2283 */ "an alias for the 'inder' option\0"
+/* 2315 */ "inraw\0"
+/* 2321 */ "Print the received DANE data in raw format\0"
+/* 2364 */ "PRINT_RAW\0"
+/* 2374 */ "no-print-raw\0"
+/* 2387 */ "Suppress several informational messages\0"
+/* 2427 */ "QUIET\0"
+/* 2433 */ "quiet\0"
+/* 2439 */ "display extended usage information and exit\0"
+/* 2483 */ "help\0"
+/* 2488 */ "extended usage information passed thru pager\0"
+/* 2533 */ "more-help\0"
+/* 2543 */ "output version information and exit\0"
+/* 2579 */ "version\0"
+/* 2587 */ "DANETOOL\0"
+/* 2596 */ "danetool - GnuTLS DANE tool\n"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
-/* 2647 */ "@PACKAGE_BUGREPORT@\0"
-/* 2667 */ "\n\0"
-/* 2669 */ "Tool to generate and check DNS resource records for the DANE protocol.\n\0"
-/* 2741 */ "danetool @VERSION@\0"
-/* 2760 */ "danetool --[tlsa-rr|check] [options]\n"
+/* 2682 */ "@PACKAGE_BUGREPORT@\0"
+/* 2702 */ "\n\0"
+/* 2704 */ "Tool to generate and check DNS resource records for the DANE protocol.\n\0"
+/* 2776 */ "danetool @VERSION@\0"
+/* 2795 */ "danetool --[tlsa-rr|check] [options]\n"
"danetool --help for additional usage instructions.\n";
/**
@@ -388,9 +388,9 @@ static int const aTlsa_RrMustList[] = {
/** Descriptive text for the starttls-proto option */
#define STARTTLS_PROTO_DESC (danetool_opt_strs+1634)
/** Upper-cased name for the starttls-proto option */
-#define STARTTLS_PROTO_NAME (danetool_opt_strs+1742)
+#define STARTTLS_PROTO_NAME (danetool_opt_strs+1777)
/** Name string for the starttls-proto option */
-#define STARTTLS_PROTO_name (danetool_opt_strs+1757)
+#define STARTTLS_PROTO_name (danetool_opt_strs+1792)
/** Compiled in flag settings for the starttls-proto option */
#define STARTTLS_PROTO_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -399,11 +399,11 @@ static int const aTlsa_RrMustList[] = {
* ca option description:
*/
/** Descriptive text for the ca option */
-#define CA_DESC (danetool_opt_strs+1772)
+#define CA_DESC (danetool_opt_strs+1807)
/** Upper-cased name for the ca option */
-#define CA_NAME (danetool_opt_strs+1846)
+#define CA_NAME (danetool_opt_strs+1881)
/** Name string for the ca option */
-#define CA_name (danetool_opt_strs+1849)
+#define CA_name (danetool_opt_strs+1884)
/** Compiled in flag settings for the ca option */
#define CA_FLAGS (OPTST_DISABLED)
@@ -411,11 +411,11 @@ static int const aTlsa_RrMustList[] = {
* x509 option description:
*/
/** Descriptive text for the x509 option */
-#define X509_DESC (danetool_opt_strs+1852)
+#define X509_DESC (danetool_opt_strs+1887)
/** Upper-cased name for the x509 option */
-#define X509_NAME (danetool_opt_strs+1918)
+#define X509_NAME (danetool_opt_strs+1953)
/** Name string for the x509 option */
-#define X509_name (danetool_opt_strs+1923)
+#define X509_name (danetool_opt_strs+1958)
/** Compiled in flag settings for the x509 option */
#define X509_FLAGS (OPTST_DISABLED)
@@ -423,10 +423,10 @@ static int const aTlsa_RrMustList[] = {
* local option description:
*/
/** Descriptive text for the local option */
-#define LOCAL_DESC (danetool_opt_strs+1928)
+#define LOCAL_DESC (danetool_opt_strs+1963)
#define LOCAL_NAME NULL
/** Unmodified name string for the local option */
-#define LOCAL_name (danetool_opt_strs+1961)
+#define LOCAL_name (danetool_opt_strs+1996)
/** Compiled in flag settings for the local option */
#define LOCAL_FLAGS (DOMAIN_FLAGS | OPTST_ALIAS)
@@ -434,13 +434,13 @@ static int const aTlsa_RrMustList[] = {
* domain option description:
*/
/** Descriptive text for the domain option */
-#define DOMAIN_DESC (danetool_opt_strs+1967)
+#define DOMAIN_DESC (danetool_opt_strs+2002)
/** Upper-cased name for the domain option */
-#define DOMAIN_NAME (danetool_opt_strs+2036)
+#define DOMAIN_NAME (danetool_opt_strs+2071)
/** disablement name for the domain option */
-#define NOT_DOMAIN_name (danetool_opt_strs+2043)
+#define NOT_DOMAIN_name (danetool_opt_strs+2078)
/** disablement prefix for the domain option */
-#define NOT_DOMAIN_PFX (danetool_opt_strs+2053)
+#define NOT_DOMAIN_PFX (danetool_opt_strs+2088)
/** Name string for the domain option */
#define DOMAIN_name (NOT_DOMAIN_name + 3)
/** Compiled in flag settings for the domain option */
@@ -450,13 +450,13 @@ static int const aTlsa_RrMustList[] = {
* local-dns option description:
*/
/** Descriptive text for the local-dns option */
-#define LOCAL_DNS_DESC (danetool_opt_strs+2056)
+#define LOCAL_DNS_DESC (danetool_opt_strs+2091)
/** Upper-cased name for the local-dns option */
-#define LOCAL_DNS_NAME (danetool_opt_strs+2102)
+#define LOCAL_DNS_NAME (danetool_opt_strs+2137)
/** disablement name for the local-dns option */
-#define NOT_LOCAL_DNS_name (danetool_opt_strs+2112)
+#define NOT_LOCAL_DNS_name (danetool_opt_strs+2147)
/** disablement prefix for the local-dns option */
-#define NOT_LOCAL_DNS_PFX (danetool_opt_strs+2053)
+#define NOT_LOCAL_DNS_PFX (danetool_opt_strs+2088)
/** Name string for the local-dns option */
#define LOCAL_DNS_name (NOT_LOCAL_DNS_name + 3)
/** Compiled in flag settings for the local-dns option */
@@ -466,11 +466,11 @@ static int const aTlsa_RrMustList[] = {
* insecure option description:
*/
/** Descriptive text for the insecure option */
-#define INSECURE_DESC (danetool_opt_strs+2125)
+#define INSECURE_DESC (danetool_opt_strs+2160)
/** Upper-cased name for the insecure option */
-#define INSECURE_NAME (danetool_opt_strs+2160)
+#define INSECURE_NAME (danetool_opt_strs+2195)
/** Name string for the insecure option */
-#define INSECURE_name (danetool_opt_strs+2169)
+#define INSECURE_name (danetool_opt_strs+2204)
/** Compiled in flag settings for the insecure option */
#define INSECURE_FLAGS (OPTST_DISABLED)
@@ -478,13 +478,13 @@ static int const aTlsa_RrMustList[] = {
* inder option description:
*/
/** Descriptive text for the inder option */
-#define INDER_DESC (danetool_opt_strs+2178)
+#define INDER_DESC (danetool_opt_strs+2213)
/** Upper-cased name for the inder option */
-#define INDER_NAME (danetool_opt_strs+2233)
+#define INDER_NAME (danetool_opt_strs+2268)
/** disablement name for the inder option */
-#define NOT_INDER_name (danetool_opt_strs+2239)
+#define NOT_INDER_name (danetool_opt_strs+2274)
/** disablement prefix for the inder option */
-#define NOT_INDER_PFX (danetool_opt_strs+2053)
+#define NOT_INDER_PFX (danetool_opt_strs+2088)
/** Name string for the inder option */
#define INDER_name (NOT_INDER_name + 3)
/** Compiled in flag settings for the inder option */
@@ -494,10 +494,10 @@ static int const aTlsa_RrMustList[] = {
* inraw option description:
*/
/** Descriptive text for the inraw option */
-#define INRAW_DESC (danetool_opt_strs+2248)
+#define INRAW_DESC (danetool_opt_strs+2283)
#define INRAW_NAME NULL
/** Unmodified name string for the inraw option */
-#define INRAW_name (danetool_opt_strs+2280)
+#define INRAW_name (danetool_opt_strs+2315)
/** Compiled in flag settings for the inraw option */
#define INRAW_FLAGS (INDER_FLAGS | OPTST_ALIAS)
@@ -505,13 +505,13 @@ static int const aTlsa_RrMustList[] = {
* print-raw option description:
*/
/** Descriptive text for the print-raw option */
-#define PRINT_RAW_DESC (danetool_opt_strs+2286)
+#define PRINT_RAW_DESC (danetool_opt_strs+2321)
/** Upper-cased name for the print-raw option */
-#define PRINT_RAW_NAME (danetool_opt_strs+2329)
+#define PRINT_RAW_NAME (danetool_opt_strs+2364)
/** disablement name for the print-raw option */
-#define NOT_PRINT_RAW_name (danetool_opt_strs+2339)
+#define NOT_PRINT_RAW_name (danetool_opt_strs+2374)
/** disablement prefix for the print-raw option */
-#define NOT_PRINT_RAW_PFX (danetool_opt_strs+2053)
+#define NOT_PRINT_RAW_PFX (danetool_opt_strs+2088)
/** Name string for the print-raw option */
#define PRINT_RAW_name (NOT_PRINT_RAW_name + 3)
/** Compiled in flag settings for the print-raw option */
@@ -521,22 +521,22 @@ static int const aTlsa_RrMustList[] = {
* quiet option description:
*/
/** Descriptive text for the quiet option */
-#define QUIET_DESC (danetool_opt_strs+2352)
+#define QUIET_DESC (danetool_opt_strs+2387)
/** Upper-cased name for the quiet option */
-#define QUIET_NAME (danetool_opt_strs+2392)
+#define QUIET_NAME (danetool_opt_strs+2427)
/** Name string for the quiet option */
-#define QUIET_name (danetool_opt_strs+2398)
+#define QUIET_name (danetool_opt_strs+2433)
/** Compiled in flag settings for the quiet option */
#define QUIET_FLAGS (OPTST_DISABLED)
/*
* Help/More_Help/Version option descriptions:
*/
-#define HELP_DESC (danetool_opt_strs+2404)
-#define HELP_name (danetool_opt_strs+2448)
+#define HELP_DESC (danetool_opt_strs+2439)
+#define HELP_name (danetool_opt_strs+2483)
#ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC (danetool_opt_strs+2453)
-#define MORE_HELP_name (danetool_opt_strs+2498)
+#define MORE_HELP_DESC (danetool_opt_strs+2488)
+#define MORE_HELP_name (danetool_opt_strs+2533)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC HELP_DESC
@@ -549,8 +549,8 @@ static int const aTlsa_RrMustList[] = {
# define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
#endif
-#define VER_DESC (danetool_opt_strs+2508)
-#define VER_name (danetool_opt_strs+2544)
+#define VER_DESC (danetool_opt_strs+2543)
+#define VER_name (danetool_opt_strs+2579)
/**
* Declare option callback procedures
*/
@@ -937,21 +937,21 @@ static tOptDesc optDesc[OPTION_CT] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/** Reference to the upper cased version of danetool. */
-#define zPROGNAME (danetool_opt_strs+2552)
+#define zPROGNAME (danetool_opt_strs+2587)
/** Reference to the title line for danetool usage. */
-#define zUsageTitle (danetool_opt_strs+2561)
+#define zUsageTitle (danetool_opt_strs+2596)
/** There is no danetool configuration file. */
#define zRcName NULL
/** There are no directories to search for danetool config files. */
#define apzHomeList NULL
/** The danetool program bug email address. */
-#define zBugsAddr (danetool_opt_strs+2647)
+#define zBugsAddr (danetool_opt_strs+2682)
/** Clarification/explanation of what danetool does. */
-#define zExplain (danetool_opt_strs+2667)
+#define zExplain (danetool_opt_strs+2702)
/** Extra detail explaining what danetool does. */
-#define zDetail (danetool_opt_strs+2669)
+#define zDetail (danetool_opt_strs+2704)
/** The full version string for danetool. */
-#define zFullVersion (danetool_opt_strs+2741)
+#define zFullVersion (danetool_opt_strs+2776)
/* extracted from optcode.tlib near line 364 */
#if defined(ENABLE_NLS)
@@ -963,7 +963,7 @@ static tOptDesc optDesc[OPTION_CT] = {
#endif /* ENABLE_NLS */
#define danetool_full_usage (NULL)
-#define danetool_short_usage (danetool_opt_strs+2760)
+#define danetool_short_usage (danetool_opt_strs+2795)
#endif /* not defined __doxygen__ */
@@ -1363,7 +1363,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.\n"));
/* referenced via danetoolOptions.pOptDesc->pzText */
puts(_("The application protocol to be used to obtain the server's certificate\n\
-(https, ftp, smtp, imap, ldap, xmpp)"));
+(https, ftp, smtp, imap, ldap, xmpp, lmtp, pop3, nntp, sieve, postgres)"));
/* referenced via danetoolOptions.pOptDesc->pzText */
puts(_("Whether the provided certificate or public key is a Certificate\n\
View Lorry Controller Status