From: Nikos Mavrogiannopoulos Date: Thu, 1 Nov 2012 14:48:17 +0000 (+0100) Subject: updated auto-generated files. X-Git-Tag: gnutls_3_1_4~62 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f43624701c67a914589a151d67bdfb1e3259b2eb;p=thirdparty%2Fgnutls.git updated auto-generated files. --- diff --git a/doc/invoke-gnutls-cli.texi b/doc/invoke-gnutls-cli.texi index 41b9e82155..07e2337a13 100644 --- a/doc/invoke-gnutls-cli.texi +++ b/doc/invoke-gnutls-cli.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (invoke-gnutls-cli.texi) # -# It has been AutoGen-ed October 13, 2012 at 08:49:25 PM by AutoGen 5.16 +# It has been AutoGen-ed November 1, 2012 at 03:48:00 PM by AutoGen 5.16 # From the definitions ../src/cli-args.def # and the template file agtexi-cmd.tpl @end ignore @@ -66,6 +66,7 @@ USAGE: gnutls-cli [ - [] | --[@{=| @}] ]... [hostname] --mtu=num Set MTU for datagram TLS - It must be in the range: 0 to 17000 + --srtp-profiles=str Offer SRTP profiles --crlf Send CR LF instead of LF --x509fmtder Use DER format for certificates to read from -f, --fingerprint Send the openpgp fingerprint, instead of the key diff --git a/doc/invoke-gnutls-serv.texi b/doc/invoke-gnutls-serv.texi index aaa79287f0..17024321e8 100644 --- a/doc/invoke-gnutls-serv.texi +++ b/doc/invoke-gnutls-serv.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (invoke-gnutls-serv.texi) # -# It has been AutoGen-ed September 30, 2012 at 04:41:49 PM by AutoGen 5.16 +# It has been AutoGen-ed November 1, 2012 at 03:47:59 PM by AutoGen 5.16 # From the definitions ../src/serv-args.def # and the template file agtexi-cmd.tpl @end ignore @@ -50,6 +50,7 @@ USAGE: gnutls-serv [ - [] | --[@{=| @}] ]... --mtu=num Set MTU for datagram TLS - It must be in the range: 0 to 17000 + --srtp-profiles=str Offer SRTP profiles -a, --disable-client-cert Do not request a client certificate -r, --require-client-cert Require a client certificate -b, --heartbeat Activate heartbeat support diff --git a/src/cli-args.c b/src/cli-args.c index c21f254a3b..d02345d35d 100644 --- a/src/cli-args.c +++ b/src/cli-args.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (cli-args.c) * - * It has been AutoGen-ed October 13, 2012 at 08:48:21 PM by AutoGen 5.16 + * It has been AutoGen-ed November 1, 2012 at 03:36:16 PM by AutoGen 5.16 * From the definitions cli-args.def * and the template file options * @@ -67,7 +67,7 @@ extern FILE * option_usage_fp; /* * gnutls-cli option static const strings */ -static char const gnutls_cli_opt_strs[3808] = +static char const gnutls_cli_opt_strs[3856] = /* 0 */ "gnutls-cli @VERSION@\n" "Copyright (C) 2000-2012 Free Software Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" @@ -130,104 +130,107 @@ static char const gnutls_cli_opt_strs[3808] = /* 1641 */ "Set MTU for datagram TLS\0" /* 1666 */ "MTU\0" /* 1670 */ "mtu\0" -/* 1674 */ "Send CR LF instead of LF\0" -/* 1699 */ "CRLF\0" -/* 1704 */ "crlf\0" -/* 1709 */ "Use DER format for certificates to read from\0" -/* 1754 */ "X509FMTDER\0" -/* 1765 */ "x509fmtder\0" -/* 1776 */ "Send the openpgp fingerprint, instead of the key\0" -/* 1825 */ "FINGERPRINT\0" -/* 1837 */ "fingerprint\0" -/* 1849 */ "Disable all the TLS extensions\0" -/* 1880 */ "DISABLE_EXTENSIONS\0" -/* 1899 */ "disable-extensions\0" -/* 1918 */ "Print peer's certificate in PEM format\0" -/* 1957 */ "PRINT_CERT\0" -/* 1968 */ "print-cert\0" -/* 1979 */ "The maximum record size to advertize\0" -/* 2016 */ "RECORDSIZE\0" -/* 2027 */ "recordsize\0" -/* 2038 */ "The minimum number of bits allowed for DH\0" -/* 2080 */ "DH_BITS\0" -/* 2088 */ "dh-bits\0" -/* 2096 */ "Priorities string\0" -/* 2114 */ "PRIORITY\0" -/* 2123 */ "priority\0" -/* 2132 */ "Certificate file or PKCS #11 URL to use\0" -/* 2172 */ "X509CAFILE\0" -/* 2183 */ "x509cafile\0" -/* 2194 */ "CRL file to use\0" -/* 2210 */ "X509CRLFILE\0" -/* 2222 */ "x509crlfile\0" -/* 2234 */ "PGP Key file to use\0" -/* 2254 */ "PGPKEYFILE\0" -/* 2265 */ "pgpkeyfile\0" -/* 2276 */ "PGP Key ring file to use\0" -/* 2301 */ "PGPKEYRING\0" -/* 2312 */ "pgpkeyring\0" -/* 2323 */ "PGP Public Key (certificate) file to use\0" -/* 2364 */ "PGPCERTFILE\0" -/* 2376 */ "pgpcertfile\0" -/* 2388 */ "X.509 key file or PKCS #11 URL to use\0" -/* 2426 */ "X509KEYFILE\0" -/* 2438 */ "x509keyfile\0" -/* 2450 */ "X.509 Certificate file or PKCS #11 URL to use\0" -/* 2496 */ "X509CERTFILE\0" -/* 2509 */ "x509certfile\0" -/* 2522 */ "PGP subkey to use (hex or auto)\0" -/* 2554 */ "PGPSUBKEY\0" -/* 2564 */ "pgpsubkey\0" -/* 2574 */ "SRP username to use\0" -/* 2594 */ "SRPUSERNAME\0" -/* 2606 */ "srpusername\0" -/* 2618 */ "SRP password to use\0" -/* 2638 */ "SRPPASSWD\0" -/* 2648 */ "srppasswd\0" -/* 2658 */ "PSK username to use\0" -/* 2678 */ "PSKUSERNAME\0" -/* 2690 */ "pskusername\0" -/* 2702 */ "PSK key (in hex) to use\0" -/* 2726 */ "PSKKEY\0" -/* 2733 */ "pskkey\0" -/* 2740 */ "The port or service to connect to\0" -/* 2774 */ "PORT\0" -/* 2779 */ "port\0" -/* 2784 */ "Don't abort program if server certificate can't be validated\0" -/* 2845 */ "INSECURE\0" -/* 2854 */ "insecure\0" -/* 2863 */ "Benchmark individual ciphers\0" -/* 2892 */ "BENCHMARK_CIPHERS\0" -/* 2910 */ "benchmark-ciphers\0" -/* 2928 */ "Benchmark individual software ciphers (no hw acceleration)\0" -/* 2987 */ "BENCHMARK_SOFT_CIPHERS\0" -/* 3010 */ "benchmark-soft-ciphers\0" -/* 3033 */ "Benchmark TLS key exchange methods\0" -/* 3068 */ "BENCHMARK_TLS_KX\0" -/* 3085 */ "benchmark-tls-kx\0" -/* 3102 */ "Benchmark TLS ciphers\0" -/* 3124 */ "BENCHMARK_TLS_CIPHERS\0" -/* 3146 */ "benchmark-tls-ciphers\0" -/* 3168 */ "Print a list of the supported algorithms and modes\0" -/* 3219 */ "LIST\0" -/* 3224 */ "list\0" -/* 3229 */ "Display extended usage information and exit\0" -/* 3273 */ "help\0" -/* 3278 */ "Extended usage information passed thru pager\0" -/* 3323 */ "more-help\0" -/* 3333 */ "Output version information and exit\0" -/* 3369 */ "version\0" -/* 3377 */ "GNUTLS_CLI\0" -/* 3388 */ "gnutls-cli - GnuTLS client - Ver. @VERSION@\n" +/* 1674 */ "Offer SRTP profiles\0" +/* 1694 */ "SRTP_PROFILES\0" +/* 1708 */ "srtp-profiles\0" +/* 1722 */ "Send CR LF instead of LF\0" +/* 1747 */ "CRLF\0" +/* 1752 */ "crlf\0" +/* 1757 */ "Use DER format for certificates to read from\0" +/* 1802 */ "X509FMTDER\0" +/* 1813 */ "x509fmtder\0" +/* 1824 */ "Send the openpgp fingerprint, instead of the key\0" +/* 1873 */ "FINGERPRINT\0" +/* 1885 */ "fingerprint\0" +/* 1897 */ "Disable all the TLS extensions\0" +/* 1928 */ "DISABLE_EXTENSIONS\0" +/* 1947 */ "disable-extensions\0" +/* 1966 */ "Print peer's certificate in PEM format\0" +/* 2005 */ "PRINT_CERT\0" +/* 2016 */ "print-cert\0" +/* 2027 */ "The maximum record size to advertize\0" +/* 2064 */ "RECORDSIZE\0" +/* 2075 */ "recordsize\0" +/* 2086 */ "The minimum number of bits allowed for DH\0" +/* 2128 */ "DH_BITS\0" +/* 2136 */ "dh-bits\0" +/* 2144 */ "Priorities string\0" +/* 2162 */ "PRIORITY\0" +/* 2171 */ "priority\0" +/* 2180 */ "Certificate file or PKCS #11 URL to use\0" +/* 2220 */ "X509CAFILE\0" +/* 2231 */ "x509cafile\0" +/* 2242 */ "CRL file to use\0" +/* 2258 */ "X509CRLFILE\0" +/* 2270 */ "x509crlfile\0" +/* 2282 */ "PGP Key file to use\0" +/* 2302 */ "PGPKEYFILE\0" +/* 2313 */ "pgpkeyfile\0" +/* 2324 */ "PGP Key ring file to use\0" +/* 2349 */ "PGPKEYRING\0" +/* 2360 */ "pgpkeyring\0" +/* 2371 */ "PGP Public Key (certificate) file to use\0" +/* 2412 */ "PGPCERTFILE\0" +/* 2424 */ "pgpcertfile\0" +/* 2436 */ "X.509 key file or PKCS #11 URL to use\0" +/* 2474 */ "X509KEYFILE\0" +/* 2486 */ "x509keyfile\0" +/* 2498 */ "X.509 Certificate file or PKCS #11 URL to use\0" +/* 2544 */ "X509CERTFILE\0" +/* 2557 */ "x509certfile\0" +/* 2570 */ "PGP subkey to use (hex or auto)\0" +/* 2602 */ "PGPSUBKEY\0" +/* 2612 */ "pgpsubkey\0" +/* 2622 */ "SRP username to use\0" +/* 2642 */ "SRPUSERNAME\0" +/* 2654 */ "srpusername\0" +/* 2666 */ "SRP password to use\0" +/* 2686 */ "SRPPASSWD\0" +/* 2696 */ "srppasswd\0" +/* 2706 */ "PSK username to use\0" +/* 2726 */ "PSKUSERNAME\0" +/* 2738 */ "pskusername\0" +/* 2750 */ "PSK key (in hex) to use\0" +/* 2774 */ "PSKKEY\0" +/* 2781 */ "pskkey\0" +/* 2788 */ "The port or service to connect to\0" +/* 2822 */ "PORT\0" +/* 2827 */ "port\0" +/* 2832 */ "Don't abort program if server certificate can't be validated\0" +/* 2893 */ "INSECURE\0" +/* 2902 */ "insecure\0" +/* 2911 */ "Benchmark individual ciphers\0" +/* 2940 */ "BENCHMARK_CIPHERS\0" +/* 2958 */ "benchmark-ciphers\0" +/* 2976 */ "Benchmark individual software ciphers (no hw acceleration)\0" +/* 3035 */ "BENCHMARK_SOFT_CIPHERS\0" +/* 3058 */ "benchmark-soft-ciphers\0" +/* 3081 */ "Benchmark TLS key exchange methods\0" +/* 3116 */ "BENCHMARK_TLS_KX\0" +/* 3133 */ "benchmark-tls-kx\0" +/* 3150 */ "Benchmark TLS ciphers\0" +/* 3172 */ "BENCHMARK_TLS_CIPHERS\0" +/* 3194 */ "benchmark-tls-ciphers\0" +/* 3216 */ "Print a list of the supported algorithms and modes\0" +/* 3267 */ "LIST\0" +/* 3272 */ "list\0" +/* 3277 */ "Display extended usage information and exit\0" +/* 3321 */ "help\0" +/* 3326 */ "Extended usage information passed thru pager\0" +/* 3371 */ "more-help\0" +/* 3381 */ "Output version information and exit\0" +/* 3417 */ "version\0" +/* 3425 */ "GNUTLS_CLI\0" +/* 3436 */ "gnutls-cli - GnuTLS client - Ver. @VERSION@\n" "USAGE: %s [ - [] | --[{=| }] ]... [hostname]\n\0" -/* 3501 */ "bug-gnutls@gnu.org\0" -/* 3520 */ "\n\n\0" -/* 3523 */ "\n" +/* 3549 */ "bug-gnutls@gnu.org\0" +/* 3568 */ "\n\n\0" +/* 3571 */ "\n" "Simple client program to set up a TLS connection to some other computer. It\n" "sets up a TLS connection and forwards data from the standard input to the\n" "secured socket and vice versa.\n\0" -/* 3707 */ "gnutls-cli @VERSION@\0" -/* 3728 */ "Usage: gnutls-cli [options] hostname\n" +/* 3755 */ "gnutls-cli @VERSION@\0" +/* 3776 */ "Usage: gnutls-cli [options] hostname\n" "gnutls-cli --help for usage instructions.\n"; /* @@ -364,246 +367,255 @@ static char const gnutls_cli_opt_strs[3808] = #define MTU_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) +/* + * srtp_profiles option description: + */ +#define SRTP_PROFILES_DESC (gnutls_cli_opt_strs+1674) +#define SRTP_PROFILES_NAME (gnutls_cli_opt_strs+1694) +#define SRTP_PROFILES_name (gnutls_cli_opt_strs+1708) +#define SRTP_PROFILES_FLAGS (OPTST_DISABLED \ + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + /* * crlf option description: */ -#define CRLF_DESC (gnutls_cli_opt_strs+1674) -#define CRLF_NAME (gnutls_cli_opt_strs+1699) -#define CRLF_name (gnutls_cli_opt_strs+1704) +#define CRLF_DESC (gnutls_cli_opt_strs+1722) +#define CRLF_NAME (gnutls_cli_opt_strs+1747) +#define CRLF_name (gnutls_cli_opt_strs+1752) #define CRLF_FLAGS (OPTST_DISABLED) /* * x509fmtder option description: */ -#define X509FMTDER_DESC (gnutls_cli_opt_strs+1709) -#define X509FMTDER_NAME (gnutls_cli_opt_strs+1754) -#define X509FMTDER_name (gnutls_cli_opt_strs+1765) +#define X509FMTDER_DESC (gnutls_cli_opt_strs+1757) +#define X509FMTDER_NAME (gnutls_cli_opt_strs+1802) +#define X509FMTDER_name (gnutls_cli_opt_strs+1813) #define X509FMTDER_FLAGS (OPTST_DISABLED) /* * fingerprint option description: */ -#define FINGERPRINT_DESC (gnutls_cli_opt_strs+1776) -#define FINGERPRINT_NAME (gnutls_cli_opt_strs+1825) -#define FINGERPRINT_name (gnutls_cli_opt_strs+1837) +#define FINGERPRINT_DESC (gnutls_cli_opt_strs+1824) +#define FINGERPRINT_NAME (gnutls_cli_opt_strs+1873) +#define FINGERPRINT_name (gnutls_cli_opt_strs+1885) #define FINGERPRINT_FLAGS (OPTST_DISABLED) /* * disable-extensions option description: */ -#define DISABLE_EXTENSIONS_DESC (gnutls_cli_opt_strs+1849) -#define DISABLE_EXTENSIONS_NAME (gnutls_cli_opt_strs+1880) -#define DISABLE_EXTENSIONS_name (gnutls_cli_opt_strs+1899) +#define DISABLE_EXTENSIONS_DESC (gnutls_cli_opt_strs+1897) +#define DISABLE_EXTENSIONS_NAME (gnutls_cli_opt_strs+1928) +#define DISABLE_EXTENSIONS_name (gnutls_cli_opt_strs+1947) #define DISABLE_EXTENSIONS_FLAGS (OPTST_DISABLED) /* * print-cert option description: */ -#define PRINT_CERT_DESC (gnutls_cli_opt_strs+1918) -#define PRINT_CERT_NAME (gnutls_cli_opt_strs+1957) -#define PRINT_CERT_name (gnutls_cli_opt_strs+1968) +#define PRINT_CERT_DESC (gnutls_cli_opt_strs+1966) +#define PRINT_CERT_NAME (gnutls_cli_opt_strs+2005) +#define PRINT_CERT_name (gnutls_cli_opt_strs+2016) #define PRINT_CERT_FLAGS (OPTST_DISABLED) /* * recordsize option description: */ -#define RECORDSIZE_DESC (gnutls_cli_opt_strs+1979) -#define RECORDSIZE_NAME (gnutls_cli_opt_strs+2016) -#define RECORDSIZE_name (gnutls_cli_opt_strs+2027) +#define RECORDSIZE_DESC (gnutls_cli_opt_strs+2027) +#define RECORDSIZE_NAME (gnutls_cli_opt_strs+2064) +#define RECORDSIZE_name (gnutls_cli_opt_strs+2075) #define RECORDSIZE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) /* * dh-bits option description: */ -#define DH_BITS_DESC (gnutls_cli_opt_strs+2038) -#define DH_BITS_NAME (gnutls_cli_opt_strs+2080) -#define DH_BITS_name (gnutls_cli_opt_strs+2088) +#define DH_BITS_DESC (gnutls_cli_opt_strs+2086) +#define DH_BITS_NAME (gnutls_cli_opt_strs+2128) +#define DH_BITS_name (gnutls_cli_opt_strs+2136) #define DH_BITS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) /* * priority option description: */ -#define PRIORITY_DESC (gnutls_cli_opt_strs+2096) -#define PRIORITY_NAME (gnutls_cli_opt_strs+2114) -#define PRIORITY_name (gnutls_cli_opt_strs+2123) +#define PRIORITY_DESC (gnutls_cli_opt_strs+2144) +#define PRIORITY_NAME (gnutls_cli_opt_strs+2162) +#define PRIORITY_name (gnutls_cli_opt_strs+2171) #define PRIORITY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * x509cafile option description: */ -#define X509CAFILE_DESC (gnutls_cli_opt_strs+2132) -#define X509CAFILE_NAME (gnutls_cli_opt_strs+2172) -#define X509CAFILE_name (gnutls_cli_opt_strs+2183) +#define X509CAFILE_DESC (gnutls_cli_opt_strs+2180) +#define X509CAFILE_NAME (gnutls_cli_opt_strs+2220) +#define X509CAFILE_name (gnutls_cli_opt_strs+2231) #define X509CAFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * x509crlfile option description: */ -#define X509CRLFILE_DESC (gnutls_cli_opt_strs+2194) -#define X509CRLFILE_NAME (gnutls_cli_opt_strs+2210) -#define X509CRLFILE_name (gnutls_cli_opt_strs+2222) +#define X509CRLFILE_DESC (gnutls_cli_opt_strs+2242) +#define X509CRLFILE_NAME (gnutls_cli_opt_strs+2258) +#define X509CRLFILE_name (gnutls_cli_opt_strs+2270) #define X509CRLFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * pgpkeyfile option description: */ -#define PGPKEYFILE_DESC (gnutls_cli_opt_strs+2234) -#define PGPKEYFILE_NAME (gnutls_cli_opt_strs+2254) -#define PGPKEYFILE_name (gnutls_cli_opt_strs+2265) +#define PGPKEYFILE_DESC (gnutls_cli_opt_strs+2282) +#define PGPKEYFILE_NAME (gnutls_cli_opt_strs+2302) +#define PGPKEYFILE_name (gnutls_cli_opt_strs+2313) #define PGPKEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * pgpkeyring option description: */ -#define PGPKEYRING_DESC (gnutls_cli_opt_strs+2276) -#define PGPKEYRING_NAME (gnutls_cli_opt_strs+2301) -#define PGPKEYRING_name (gnutls_cli_opt_strs+2312) +#define PGPKEYRING_DESC (gnutls_cli_opt_strs+2324) +#define PGPKEYRING_NAME (gnutls_cli_opt_strs+2349) +#define PGPKEYRING_name (gnutls_cli_opt_strs+2360) #define PGPKEYRING_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * pgpcertfile option description: */ -#define PGPCERTFILE_DESC (gnutls_cli_opt_strs+2323) -#define PGPCERTFILE_NAME (gnutls_cli_opt_strs+2364) -#define PGPCERTFILE_name (gnutls_cli_opt_strs+2376) +#define PGPCERTFILE_DESC (gnutls_cli_opt_strs+2371) +#define PGPCERTFILE_NAME (gnutls_cli_opt_strs+2412) +#define PGPCERTFILE_name (gnutls_cli_opt_strs+2424) #define PGPCERTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * x509keyfile option description: */ -#define X509KEYFILE_DESC (gnutls_cli_opt_strs+2388) -#define X509KEYFILE_NAME (gnutls_cli_opt_strs+2426) -#define X509KEYFILE_name (gnutls_cli_opt_strs+2438) +#define X509KEYFILE_DESC (gnutls_cli_opt_strs+2436) +#define X509KEYFILE_NAME (gnutls_cli_opt_strs+2474) +#define X509KEYFILE_name (gnutls_cli_opt_strs+2486) #define X509KEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * x509certfile option description: */ -#define X509CERTFILE_DESC (gnutls_cli_opt_strs+2450) -#define X509CERTFILE_NAME (gnutls_cli_opt_strs+2496) -#define X509CERTFILE_name (gnutls_cli_opt_strs+2509) +#define X509CERTFILE_DESC (gnutls_cli_opt_strs+2498) +#define X509CERTFILE_NAME (gnutls_cli_opt_strs+2544) +#define X509CERTFILE_name (gnutls_cli_opt_strs+2557) #define X509CERTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * pgpsubkey option description: */ -#define PGPSUBKEY_DESC (gnutls_cli_opt_strs+2522) -#define PGPSUBKEY_NAME (gnutls_cli_opt_strs+2554) -#define PGPSUBKEY_name (gnutls_cli_opt_strs+2564) +#define PGPSUBKEY_DESC (gnutls_cli_opt_strs+2570) +#define PGPSUBKEY_NAME (gnutls_cli_opt_strs+2602) +#define PGPSUBKEY_name (gnutls_cli_opt_strs+2612) #define PGPSUBKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * srpusername option description: */ -#define SRPUSERNAME_DESC (gnutls_cli_opt_strs+2574) -#define SRPUSERNAME_NAME (gnutls_cli_opt_strs+2594) -#define SRPUSERNAME_name (gnutls_cli_opt_strs+2606) +#define SRPUSERNAME_DESC (gnutls_cli_opt_strs+2622) +#define SRPUSERNAME_NAME (gnutls_cli_opt_strs+2642) +#define SRPUSERNAME_name (gnutls_cli_opt_strs+2654) #define SRPUSERNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * srppasswd option description: */ -#define SRPPASSWD_DESC (gnutls_cli_opt_strs+2618) -#define SRPPASSWD_NAME (gnutls_cli_opt_strs+2638) -#define SRPPASSWD_name (gnutls_cli_opt_strs+2648) +#define SRPPASSWD_DESC (gnutls_cli_opt_strs+2666) +#define SRPPASSWD_NAME (gnutls_cli_opt_strs+2686) +#define SRPPASSWD_name (gnutls_cli_opt_strs+2696) #define SRPPASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * pskusername option description: */ -#define PSKUSERNAME_DESC (gnutls_cli_opt_strs+2658) -#define PSKUSERNAME_NAME (gnutls_cli_opt_strs+2678) -#define PSKUSERNAME_name (gnutls_cli_opt_strs+2690) +#define PSKUSERNAME_DESC (gnutls_cli_opt_strs+2706) +#define PSKUSERNAME_NAME (gnutls_cli_opt_strs+2726) +#define PSKUSERNAME_name (gnutls_cli_opt_strs+2738) #define PSKUSERNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * pskkey option description: */ -#define PSKKEY_DESC (gnutls_cli_opt_strs+2702) -#define PSKKEY_NAME (gnutls_cli_opt_strs+2726) -#define PSKKEY_name (gnutls_cli_opt_strs+2733) +#define PSKKEY_DESC (gnutls_cli_opt_strs+2750) +#define PSKKEY_NAME (gnutls_cli_opt_strs+2774) +#define PSKKEY_name (gnutls_cli_opt_strs+2781) #define PSKKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * port option description: */ -#define PORT_DESC (gnutls_cli_opt_strs+2740) -#define PORT_NAME (gnutls_cli_opt_strs+2774) -#define PORT_name (gnutls_cli_opt_strs+2779) +#define PORT_DESC (gnutls_cli_opt_strs+2788) +#define PORT_NAME (gnutls_cli_opt_strs+2822) +#define PORT_name (gnutls_cli_opt_strs+2827) #define PORT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * insecure option description: */ -#define INSECURE_DESC (gnutls_cli_opt_strs+2784) -#define INSECURE_NAME (gnutls_cli_opt_strs+2845) -#define INSECURE_name (gnutls_cli_opt_strs+2854) +#define INSECURE_DESC (gnutls_cli_opt_strs+2832) +#define INSECURE_NAME (gnutls_cli_opt_strs+2893) +#define INSECURE_name (gnutls_cli_opt_strs+2902) #define INSECURE_FLAGS (OPTST_DISABLED) /* * benchmark-ciphers option description: */ -#define BENCHMARK_CIPHERS_DESC (gnutls_cli_opt_strs+2863) -#define BENCHMARK_CIPHERS_NAME (gnutls_cli_opt_strs+2892) -#define BENCHMARK_CIPHERS_name (gnutls_cli_opt_strs+2910) +#define BENCHMARK_CIPHERS_DESC (gnutls_cli_opt_strs+2911) +#define BENCHMARK_CIPHERS_NAME (gnutls_cli_opt_strs+2940) +#define BENCHMARK_CIPHERS_name (gnutls_cli_opt_strs+2958) #define BENCHMARK_CIPHERS_FLAGS (OPTST_DISABLED) /* * benchmark-soft-ciphers option description: */ -#define BENCHMARK_SOFT_CIPHERS_DESC (gnutls_cli_opt_strs+2928) -#define BENCHMARK_SOFT_CIPHERS_NAME (gnutls_cli_opt_strs+2987) -#define BENCHMARK_SOFT_CIPHERS_name (gnutls_cli_opt_strs+3010) +#define BENCHMARK_SOFT_CIPHERS_DESC (gnutls_cli_opt_strs+2976) +#define BENCHMARK_SOFT_CIPHERS_NAME (gnutls_cli_opt_strs+3035) +#define BENCHMARK_SOFT_CIPHERS_name (gnutls_cli_opt_strs+3058) #define BENCHMARK_SOFT_CIPHERS_FLAGS (OPTST_DISABLED) /* * benchmark-tls-kx option description: */ -#define BENCHMARK_TLS_KX_DESC (gnutls_cli_opt_strs+3033) -#define BENCHMARK_TLS_KX_NAME (gnutls_cli_opt_strs+3068) -#define BENCHMARK_TLS_KX_name (gnutls_cli_opt_strs+3085) +#define BENCHMARK_TLS_KX_DESC (gnutls_cli_opt_strs+3081) +#define BENCHMARK_TLS_KX_NAME (gnutls_cli_opt_strs+3116) +#define BENCHMARK_TLS_KX_name (gnutls_cli_opt_strs+3133) #define BENCHMARK_TLS_KX_FLAGS (OPTST_DISABLED) /* * benchmark-tls-ciphers option description: */ -#define BENCHMARK_TLS_CIPHERS_DESC (gnutls_cli_opt_strs+3102) -#define BENCHMARK_TLS_CIPHERS_NAME (gnutls_cli_opt_strs+3124) -#define BENCHMARK_TLS_CIPHERS_name (gnutls_cli_opt_strs+3146) +#define BENCHMARK_TLS_CIPHERS_DESC (gnutls_cli_opt_strs+3150) +#define BENCHMARK_TLS_CIPHERS_NAME (gnutls_cli_opt_strs+3172) +#define BENCHMARK_TLS_CIPHERS_name (gnutls_cli_opt_strs+3194) #define BENCHMARK_TLS_CIPHERS_FLAGS (OPTST_DISABLED) /* * list option description: */ -#define LIST_DESC (gnutls_cli_opt_strs+3168) -#define LIST_NAME (gnutls_cli_opt_strs+3219) -#define LIST_name (gnutls_cli_opt_strs+3224) +#define LIST_DESC (gnutls_cli_opt_strs+3216) +#define LIST_NAME (gnutls_cli_opt_strs+3267) +#define LIST_name (gnutls_cli_opt_strs+3272) #define LIST_FLAGS (OPTST_DISABLED) /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (gnutls_cli_opt_strs+3229) -#define HELP_name (gnutls_cli_opt_strs+3273) +#define HELP_DESC (gnutls_cli_opt_strs+3277) +#define HELP_name (gnutls_cli_opt_strs+3321) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (gnutls_cli_opt_strs+3278) -#define MORE_HELP_name (gnutls_cli_opt_strs+3323) +#define MORE_HELP_DESC (gnutls_cli_opt_strs+3326) +#define MORE_HELP_name (gnutls_cli_opt_strs+3371) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC NULL @@ -616,8 +628,8 @@ static char const gnutls_cli_opt_strs[3808] = # 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+3333) -#define VER_name (gnutls_cli_opt_strs+3369) +#define VER_DESC (gnutls_cli_opt_strs+3381) +#define VER_name (gnutls_cli_opt_strs+3417) /* * Declare option callback procedures */ @@ -818,8 +830,20 @@ 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 */ 15, VALUE_OPT_SRTP_PROFILES, + /* equiv idx, value */ 15, VALUE_OPT_SRTP_PROFILES, + /* equivalenced to */ NO_EQUIVALENT, + /* min, max, act ct */ 0, 1, 0, + /* opt state flags */ SRTP_PROFILES_FLAGS, 0, + /* last opt argumnt */ { NULL }, /* --srtp_profiles */ + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, NULL, + /* option proc */ NULL, + /* desc, NAME, name */ SRTP_PROFILES_DESC, SRTP_PROFILES_NAME, SRTP_PROFILES_name, + /* disablement strs */ NULL, NULL }, + + { /* 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, @@ -830,8 +854,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_X509FMTDER, - /* equiv idx, value */ 16, VALUE_OPT_X509FMTDER, + { /* entry idx, value */ 17, VALUE_OPT_X509FMTDER, + /* equiv idx, value */ 17, VALUE_OPT_X509FMTDER, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509FMTDER_FLAGS, 0, @@ -842,8 +866,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509FMTDER_DESC, X509FMTDER_NAME, X509FMTDER_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 17, VALUE_OPT_FINGERPRINT, - /* equiv idx, value */ 17, VALUE_OPT_FINGERPRINT, + { /* entry idx, value */ 18, VALUE_OPT_FINGERPRINT, + /* equiv idx, value */ 18, VALUE_OPT_FINGERPRINT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ FINGERPRINT_FLAGS, 0, @@ -854,8 +878,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ FINGERPRINT_DESC, FINGERPRINT_NAME, FINGERPRINT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 18, VALUE_OPT_DISABLE_EXTENSIONS, - /* equiv idx, value */ 18, VALUE_OPT_DISABLE_EXTENSIONS, + { /* entry idx, value */ 19, VALUE_OPT_DISABLE_EXTENSIONS, + /* equiv idx, value */ 19, VALUE_OPT_DISABLE_EXTENSIONS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ DISABLE_EXTENSIONS_FLAGS, 0, @@ -866,8 +890,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 */ 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, @@ -878,8 +902,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_RECORDSIZE, - /* equiv idx, value */ 20, VALUE_OPT_RECORDSIZE, + { /* entry idx, value */ 21, VALUE_OPT_RECORDSIZE, + /* equiv idx, value */ 21, VALUE_OPT_RECORDSIZE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ RECORDSIZE_FLAGS, 0, @@ -890,8 +914,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ RECORDSIZE_DESC, RECORDSIZE_NAME, RECORDSIZE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 21, VALUE_OPT_DH_BITS, - /* equiv idx, value */ 21, VALUE_OPT_DH_BITS, + { /* entry idx, value */ 22, VALUE_OPT_DH_BITS, + /* equiv idx, value */ 22, VALUE_OPT_DH_BITS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ DH_BITS_FLAGS, 0, @@ -902,8 +926,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 */ 22, VALUE_OPT_PRIORITY, - /* equiv idx, value */ 22, VALUE_OPT_PRIORITY, + { /* entry idx, value */ 23, VALUE_OPT_PRIORITY, + /* equiv idx, value */ 23, VALUE_OPT_PRIORITY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PRIORITY_FLAGS, 0, @@ -914,8 +938,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PRIORITY_DESC, PRIORITY_NAME, PRIORITY_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 23, VALUE_OPT_X509CAFILE, - /* equiv idx, value */ 23, VALUE_OPT_X509CAFILE, + { /* entry idx, value */ 24, VALUE_OPT_X509CAFILE, + /* equiv idx, value */ 24, VALUE_OPT_X509CAFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509CAFILE_FLAGS, 0, @@ -926,8 +950,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509CAFILE_DESC, X509CAFILE_NAME, X509CAFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 24, VALUE_OPT_X509CRLFILE, - /* equiv idx, value */ 24, VALUE_OPT_X509CRLFILE, + { /* entry idx, value */ 25, VALUE_OPT_X509CRLFILE, + /* equiv idx, value */ 25, VALUE_OPT_X509CRLFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509CRLFILE_FLAGS, 0, @@ -938,8 +962,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509CRLFILE_DESC, X509CRLFILE_NAME, X509CRLFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 25, VALUE_OPT_PGPKEYFILE, - /* equiv idx, value */ 25, VALUE_OPT_PGPKEYFILE, + { /* entry idx, value */ 26, VALUE_OPT_PGPKEYFILE, + /* equiv idx, value */ 26, VALUE_OPT_PGPKEYFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PGPKEYFILE_FLAGS, 0, @@ -950,8 +974,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PGPKEYFILE_DESC, PGPKEYFILE_NAME, PGPKEYFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 26, VALUE_OPT_PGPKEYRING, - /* equiv idx, value */ 26, VALUE_OPT_PGPKEYRING, + { /* entry idx, value */ 27, VALUE_OPT_PGPKEYRING, + /* equiv idx, value */ 27, VALUE_OPT_PGPKEYRING, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PGPKEYRING_FLAGS, 0, @@ -962,8 +986,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PGPKEYRING_DESC, PGPKEYRING_NAME, PGPKEYRING_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 27, VALUE_OPT_PGPCERTFILE, - /* equiv idx, value */ 27, VALUE_OPT_PGPCERTFILE, + { /* entry idx, value */ 28, VALUE_OPT_PGPCERTFILE, + /* equiv idx, value */ 28, VALUE_OPT_PGPCERTFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PGPCERTFILE_FLAGS, 0, @@ -974,8 +998,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PGPCERTFILE_DESC, PGPCERTFILE_NAME, PGPCERTFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 28, VALUE_OPT_X509KEYFILE, - /* equiv idx, value */ 28, VALUE_OPT_X509KEYFILE, + { /* entry idx, value */ 29, VALUE_OPT_X509KEYFILE, + /* equiv idx, value */ 29, VALUE_OPT_X509KEYFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509KEYFILE_FLAGS, 0, @@ -986,8 +1010,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509KEYFILE_DESC, X509KEYFILE_NAME, X509KEYFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 29, VALUE_OPT_X509CERTFILE, - /* equiv idx, value */ 29, VALUE_OPT_X509CERTFILE, + { /* entry idx, value */ 30, VALUE_OPT_X509CERTFILE, + /* equiv idx, value */ 30, VALUE_OPT_X509CERTFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509CERTFILE_FLAGS, 0, @@ -998,8 +1022,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509CERTFILE_DESC, X509CERTFILE_NAME, X509CERTFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 30, VALUE_OPT_PGPSUBKEY, - /* equiv idx, value */ 30, VALUE_OPT_PGPSUBKEY, + { /* entry idx, value */ 31, VALUE_OPT_PGPSUBKEY, + /* equiv idx, value */ 31, VALUE_OPT_PGPSUBKEY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PGPSUBKEY_FLAGS, 0, @@ -1010,8 +1034,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PGPSUBKEY_DESC, PGPSUBKEY_NAME, PGPSUBKEY_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 31, VALUE_OPT_SRPUSERNAME, - /* equiv idx, value */ 31, VALUE_OPT_SRPUSERNAME, + { /* entry idx, value */ 32, VALUE_OPT_SRPUSERNAME, + /* equiv idx, value */ 32, VALUE_OPT_SRPUSERNAME, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SRPUSERNAME_FLAGS, 0, @@ -1022,8 +1046,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SRPUSERNAME_DESC, SRPUSERNAME_NAME, SRPUSERNAME_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 32, VALUE_OPT_SRPPASSWD, - /* equiv idx, value */ 32, VALUE_OPT_SRPPASSWD, + { /* entry idx, value */ 33, VALUE_OPT_SRPPASSWD, + /* equiv idx, value */ 33, VALUE_OPT_SRPPASSWD, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SRPPASSWD_FLAGS, 0, @@ -1034,8 +1058,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SRPPASSWD_DESC, SRPPASSWD_NAME, SRPPASSWD_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 33, VALUE_OPT_PSKUSERNAME, - /* equiv idx, value */ 33, VALUE_OPT_PSKUSERNAME, + { /* entry idx, value */ 34, VALUE_OPT_PSKUSERNAME, + /* equiv idx, value */ 34, VALUE_OPT_PSKUSERNAME, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PSKUSERNAME_FLAGS, 0, @@ -1046,8 +1070,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PSKUSERNAME_DESC, PSKUSERNAME_NAME, PSKUSERNAME_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 34, VALUE_OPT_PSKKEY, - /* equiv idx, value */ 34, VALUE_OPT_PSKKEY, + { /* entry idx, value */ 35, VALUE_OPT_PSKKEY, + /* equiv idx, value */ 35, VALUE_OPT_PSKKEY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PSKKEY_FLAGS, 0, @@ -1058,8 +1082,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PSKKEY_DESC, PSKKEY_NAME, PSKKEY_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 35, VALUE_OPT_PORT, - /* equiv idx, value */ 35, VALUE_OPT_PORT, + { /* entry idx, value */ 36, VALUE_OPT_PORT, + /* equiv idx, value */ 36, VALUE_OPT_PORT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PORT_FLAGS, 0, @@ -1070,8 +1094,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PORT_DESC, PORT_NAME, PORT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 36, VALUE_OPT_INSECURE, - /* equiv idx, value */ 36, VALUE_OPT_INSECURE, + { /* entry idx, value */ 37, VALUE_OPT_INSECURE, + /* equiv idx, value */ 37, VALUE_OPT_INSECURE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ INSECURE_FLAGS, 0, @@ -1082,8 +1106,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ INSECURE_DESC, INSECURE_NAME, INSECURE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 37, VALUE_OPT_BENCHMARK_CIPHERS, - /* equiv idx, value */ 37, VALUE_OPT_BENCHMARK_CIPHERS, + { /* entry idx, value */ 38, VALUE_OPT_BENCHMARK_CIPHERS, + /* equiv idx, value */ 38, VALUE_OPT_BENCHMARK_CIPHERS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ BENCHMARK_CIPHERS_FLAGS, 0, @@ -1094,8 +1118,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 */ 38, VALUE_OPT_BENCHMARK_SOFT_CIPHERS, - /* equiv idx, value */ 38, VALUE_OPT_BENCHMARK_SOFT_CIPHERS, + { /* entry idx, value */ 39, VALUE_OPT_BENCHMARK_SOFT_CIPHERS, + /* equiv idx, value */ 39, VALUE_OPT_BENCHMARK_SOFT_CIPHERS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ BENCHMARK_SOFT_CIPHERS_FLAGS, 0, @@ -1106,8 +1130,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ BENCHMARK_SOFT_CIPHERS_DESC, BENCHMARK_SOFT_CIPHERS_NAME, BENCHMARK_SOFT_CIPHERS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 39, VALUE_OPT_BENCHMARK_TLS_KX, - /* equiv idx, value */ 39, VALUE_OPT_BENCHMARK_TLS_KX, + { /* entry idx, value */ 40, VALUE_OPT_BENCHMARK_TLS_KX, + /* equiv idx, value */ 40, VALUE_OPT_BENCHMARK_TLS_KX, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ BENCHMARK_TLS_KX_FLAGS, 0, @@ -1118,8 +1142,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 */ 40, VALUE_OPT_BENCHMARK_TLS_CIPHERS, - /* equiv idx, value */ 40, VALUE_OPT_BENCHMARK_TLS_CIPHERS, + { /* entry idx, value */ 41, VALUE_OPT_BENCHMARK_TLS_CIPHERS, + /* equiv idx, value */ 41, VALUE_OPT_BENCHMARK_TLS_CIPHERS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ BENCHMARK_TLS_CIPHERS_FLAGS, 0, @@ -1130,8 +1154,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 */ 41, VALUE_OPT_LIST, - /* equiv idx, value */ 41, VALUE_OPT_LIST, + { /* entry idx, value */ 42, VALUE_OPT_LIST, + /* equiv idx, value */ 42, VALUE_OPT_LIST, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ LIST_FLAGS, 0, @@ -1186,14 +1210,14 @@ static tOptDesc optDesc[OPTION_CT] = { * * Define the gnutls-cli Option Environment */ -#define zPROGNAME (gnutls_cli_opt_strs+3377) -#define zUsageTitle (gnutls_cli_opt_strs+3388) +#define zPROGNAME (gnutls_cli_opt_strs+3425) +#define zUsageTitle (gnutls_cli_opt_strs+3436) #define zRcName NULL #define apzHomeList NULL -#define zBugsAddr (gnutls_cli_opt_strs+3501) -#define zExplain (gnutls_cli_opt_strs+3520) -#define zDetail (gnutls_cli_opt_strs+3523) -#define zFullVersion (gnutls_cli_opt_strs+3707) +#define zBugsAddr (gnutls_cli_opt_strs+3549) +#define zExplain (gnutls_cli_opt_strs+3568) +#define zDetail (gnutls_cli_opt_strs+3571) +#define zFullVersion (gnutls_cli_opt_strs+3755) /* extracted from optcode.tlib near line 350 */ #if defined(ENABLE_NLS) @@ -1207,7 +1231,7 @@ static tOptDesc optDesc[OPTION_CT] = { #define gnutls_cli_full_usage (NULL) -#define gnutls_cli_short_usage (gnutls_cli_opt_strs+3728) +#define gnutls_cli_short_usage (gnutls_cli_opt_strs+3776) #endif /* not defined __doxygen__ */ @@ -1485,7 +1509,7 @@ tOptions gnutls_cliOptions = { NO_EQUIVALENT, /* '-#' option index */ NO_EQUIVALENT /* index of default opt */ }, - 45 /* full option count */, 42 /* user option count */, + 46 /* full option count */, 43 /* user option count */, gnutls_cli_full_usage, gnutls_cli_short_usage, NULL, NULL, PKGDATADIR, gnutls_cli_packager_info diff --git a/src/cli-args.h b/src/cli-args.h index f664a70294..384c7d0ed0 100644 --- a/src/cli-args.h +++ b/src/cli-args.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (cli-args.h) * - * It has been AutoGen-ed October 13, 2012 at 08:48:21 PM by AutoGen 5.16 + * It has been AutoGen-ed November 1, 2012 at 03:36:16 PM by AutoGen 5.16 * From the definitions cli-args.def * and the template file options * @@ -82,39 +82,40 @@ typedef enum { INDEX_OPT_STARTTLS = 12, INDEX_OPT_UDP = 13, INDEX_OPT_MTU = 14, - INDEX_OPT_CRLF = 15, - INDEX_OPT_X509FMTDER = 16, - INDEX_OPT_FINGERPRINT = 17, - INDEX_OPT_DISABLE_EXTENSIONS = 18, - INDEX_OPT_PRINT_CERT = 19, - INDEX_OPT_RECORDSIZE = 20, - INDEX_OPT_DH_BITS = 21, - INDEX_OPT_PRIORITY = 22, - INDEX_OPT_X509CAFILE = 23, - INDEX_OPT_X509CRLFILE = 24, - INDEX_OPT_PGPKEYFILE = 25, - INDEX_OPT_PGPKEYRING = 26, - INDEX_OPT_PGPCERTFILE = 27, - INDEX_OPT_X509KEYFILE = 28, - INDEX_OPT_X509CERTFILE = 29, - INDEX_OPT_PGPSUBKEY = 30, - INDEX_OPT_SRPUSERNAME = 31, - INDEX_OPT_SRPPASSWD = 32, - INDEX_OPT_PSKUSERNAME = 33, - INDEX_OPT_PSKKEY = 34, - INDEX_OPT_PORT = 35, - INDEX_OPT_INSECURE = 36, - INDEX_OPT_BENCHMARK_CIPHERS = 37, - INDEX_OPT_BENCHMARK_SOFT_CIPHERS = 38, - INDEX_OPT_BENCHMARK_TLS_KX = 39, - INDEX_OPT_BENCHMARK_TLS_CIPHERS = 40, - INDEX_OPT_LIST = 41, - INDEX_OPT_VERSION = 42, - INDEX_OPT_HELP = 43, - INDEX_OPT_MORE_HELP = 44 + INDEX_OPT_SRTP_PROFILES = 15, + INDEX_OPT_CRLF = 16, + INDEX_OPT_X509FMTDER = 17, + INDEX_OPT_FINGERPRINT = 18, + INDEX_OPT_DISABLE_EXTENSIONS = 19, + INDEX_OPT_PRINT_CERT = 20, + INDEX_OPT_RECORDSIZE = 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_BENCHMARK_CIPHERS = 38, + INDEX_OPT_BENCHMARK_SOFT_CIPHERS = 39, + INDEX_OPT_BENCHMARK_TLS_KX = 40, + INDEX_OPT_BENCHMARK_TLS_CIPHERS = 41, + INDEX_OPT_LIST = 42, + INDEX_OPT_VERSION = 43, + INDEX_OPT_HELP = 44, + INDEX_OPT_MORE_HELP = 45 } teOptIndex; -#define OPTION_CT 45 +#define OPTION_CT 46 #define GNUTLS_CLI_VERSION "@VERSION@" #define GNUTLS_CLI_FULL_VERSION "gnutls-cli @VERSION@" @@ -171,36 +172,37 @@ typedef enum { #define VALUE_OPT_MTU 14 #define OPT_VALUE_MTU (DESC(MTU).optArg.argInt) -#define VALUE_OPT_CRLF 15 -#define VALUE_OPT_X509FMTDER 16 +#define VALUE_OPT_SRTP_PROFILES 15 +#define VALUE_OPT_CRLF 16 +#define VALUE_OPT_X509FMTDER 17 #define VALUE_OPT_FINGERPRINT 'f' -#define VALUE_OPT_DISABLE_EXTENSIONS 18 -#define VALUE_OPT_PRINT_CERT 19 -#define VALUE_OPT_RECORDSIZE 20 +#define VALUE_OPT_DISABLE_EXTENSIONS 19 +#define VALUE_OPT_PRINT_CERT 20 +#define VALUE_OPT_RECORDSIZE 21 #define OPT_VALUE_RECORDSIZE (DESC(RECORDSIZE).optArg.argInt) -#define VALUE_OPT_DH_BITS 21 +#define VALUE_OPT_DH_BITS 22 #define OPT_VALUE_DH_BITS (DESC(DH_BITS).optArg.argInt) -#define VALUE_OPT_PRIORITY 22 -#define VALUE_OPT_X509CAFILE 23 -#define VALUE_OPT_X509CRLFILE 24 -#define VALUE_OPT_PGPKEYFILE 25 -#define VALUE_OPT_PGPKEYRING 26 -#define VALUE_OPT_PGPCERTFILE 27 -#define VALUE_OPT_X509KEYFILE 28 -#define VALUE_OPT_X509CERTFILE 29 -#define VALUE_OPT_PGPSUBKEY 30 -#define VALUE_OPT_SRPUSERNAME 31 -#define VALUE_OPT_SRPPASSWD 32 -#define VALUE_OPT_PSKUSERNAME 129 -#define VALUE_OPT_PSKKEY 130 +#define VALUE_OPT_PRIORITY 23 +#define VALUE_OPT_X509CAFILE 24 +#define VALUE_OPT_X509CRLFILE 25 +#define VALUE_OPT_PGPKEYFILE 26 +#define VALUE_OPT_PGPKEYRING 27 +#define VALUE_OPT_PGPCERTFILE 28 +#define VALUE_OPT_X509KEYFILE 29 +#define VALUE_OPT_X509CERTFILE 30 +#define VALUE_OPT_PGPSUBKEY 31 +#define VALUE_OPT_SRPUSERNAME 32 +#define VALUE_OPT_SRPPASSWD 129 +#define VALUE_OPT_PSKUSERNAME 130 +#define VALUE_OPT_PSKKEY 131 #define VALUE_OPT_PORT 'p' -#define VALUE_OPT_INSECURE 132 -#define VALUE_OPT_BENCHMARK_CIPHERS 133 -#define VALUE_OPT_BENCHMARK_SOFT_CIPHERS 134 -#define VALUE_OPT_BENCHMARK_TLS_KX 135 -#define VALUE_OPT_BENCHMARK_TLS_CIPHERS 136 +#define VALUE_OPT_INSECURE 133 +#define VALUE_OPT_BENCHMARK_CIPHERS 134 +#define VALUE_OPT_BENCHMARK_SOFT_CIPHERS 135 +#define VALUE_OPT_BENCHMARK_TLS_KX 136 +#define VALUE_OPT_BENCHMARK_TLS_CIPHERS 137 #define VALUE_OPT_LIST 'l' #define VALUE_OPT_HELP 'h' #define VALUE_OPT_MORE_HELP '!' diff --git a/src/serv-args.c b/src/serv-args.c index 35dafc1309..9f9f3aaafe 100644 --- a/src/serv-args.c +++ b/src/serv-args.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (serv-args.c) * - * It has been AutoGen-ed September 30, 2012 at 03:29:31 PM by AutoGen 5.16 + * It has been AutoGen-ed November 1, 2012 at 03:36:17 PM by AutoGen 5.16 * From the definitions serv-args.def * and the template file options * @@ -67,7 +67,7 @@ extern FILE * option_usage_fp; /* * gnutls-serv option static const strings */ -static char const gnutls_serv_opt_strs[3058] = +static char const gnutls_serv_opt_strs[3106] = /* 0 */ "gnutls-serv @VERSION@\n" "Copyright (C) 2000-2012 Free Software Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" @@ -111,94 +111,97 @@ static char const gnutls_serv_opt_strs[3058] = /* 1221 */ "Set MTU for datagram TLS\0" /* 1246 */ "MTU\0" /* 1250 */ "mtu\0" -/* 1254 */ "Do not request a client certificate\0" -/* 1290 */ "DISABLE_CLIENT_CERT\0" -/* 1310 */ "disable-client-cert\0" -/* 1330 */ "Require a client certificate\0" -/* 1359 */ "REQUIRE_CLIENT_CERT\0" -/* 1379 */ "require-client-cert\0" -/* 1399 */ "Activate heartbeat support\0" -/* 1426 */ "HEARTBEAT\0" -/* 1436 */ "heartbeat\0" -/* 1446 */ "Use DER format for certificates to read from\0" -/* 1491 */ "X509FMTDER\0" -/* 1502 */ "x509fmtder\0" -/* 1513 */ "Priorities string\0" -/* 1531 */ "PRIORITY\0" -/* 1540 */ "priority\0" -/* 1549 */ "DH params file to use\0" -/* 1571 */ "DHPARAMS\0" -/* 1580 */ "dhparams\0" -/* 1589 */ "Certificate file or PKCS #11 URL to use\0" -/* 1629 */ "X509CAFILE\0" -/* 1640 */ "x509cafile\0" -/* 1651 */ "CRL file to use\0" -/* 1667 */ "X509CRLFILE\0" -/* 1679 */ "x509crlfile\0" -/* 1691 */ "PGP Key file to use\0" -/* 1711 */ "PGPKEYFILE\0" -/* 1722 */ "pgpkeyfile\0" -/* 1733 */ "PGP Key ring file to use\0" -/* 1758 */ "PGPKEYRING\0" -/* 1769 */ "pgpkeyring\0" -/* 1780 */ "PGP Public Key (certificate) file to use\0" -/* 1821 */ "PGPCERTFILE\0" -/* 1833 */ "pgpcertfile\0" -/* 1845 */ "X.509 key file or PKCS #11 URL to use\0" -/* 1883 */ "X509KEYFILE\0" -/* 1895 */ "x509keyfile\0" -/* 1907 */ "X.509 Certificate file or PKCS #11 URL to use\0" -/* 1953 */ "X509CERTFILE\0" -/* 1966 */ "x509certfile\0" -/* 1979 */ "Alternative X.509 key file or PKCS #11 URL to use\0" -/* 2029 */ "X509DSAKEYFILE\0" -/* 2044 */ "x509dsakeyfile\0" -/* 2059 */ "Alternative X.509 Certificate file or PKCS #11 URL to use\0" -/* 2117 */ "X509DSACERTFILE\0" -/* 2133 */ "x509dsacertfile\0" -/* 2149 */ "X509ECCKEYFILE\0" -/* 2164 */ "x509ecckeyfile\0" -/* 2179 */ "X509ECCCERTFILE\0" -/* 2195 */ "x509ecccertfile\0" -/* 2211 */ "PGP subkey to use (hex or auto)\0" -/* 2243 */ "PGPSUBKEY\0" -/* 2253 */ "pgpsubkey\0" -/* 2263 */ "SRP password file to use\0" -/* 2288 */ "SRPPASSWD\0" -/* 2298 */ "srppasswd\0" -/* 2308 */ "SRP password configuration file to use\0" -/* 2347 */ "SRPPASSWDCONF\0" -/* 2361 */ "srppasswdconf\0" -/* 2375 */ "PSK password file to use\0" -/* 2400 */ "PSKPASSWD\0" -/* 2410 */ "pskpasswd\0" -/* 2420 */ "PSK identity hint to use\0" -/* 2445 */ "PSKHINT\0" -/* 2453 */ "pskhint\0" -/* 2461 */ "The OCSP response to send to client\0" -/* 2497 */ "OCSP_RESPONSE\0" -/* 2511 */ "ocsp-response\0" -/* 2525 */ "The port to connect to\0" -/* 2548 */ "PORT\0" -/* 2553 */ "port\0" -/* 2558 */ "Print a list of the supported algorithms and modes\0" -/* 2609 */ "LIST\0" -/* 2614 */ "list\0" -/* 2619 */ "Display extended usage information and exit\0" -/* 2663 */ "help\0" -/* 2668 */ "Extended usage information passed thru pager\0" -/* 2713 */ "more-help\0" -/* 2723 */ "Output version information and exit\0" -/* 2759 */ "version\0" -/* 2767 */ "GNUTLS_SERV\0" -/* 2779 */ "gnutls-serv - GnuTLS server - Ver. @VERSION@\n" +/* 1254 */ "Offer SRTP profiles\0" +/* 1274 */ "SRTP_PROFILES\0" +/* 1288 */ "srtp-profiles\0" +/* 1302 */ "Do not request a client certificate\0" +/* 1338 */ "DISABLE_CLIENT_CERT\0" +/* 1358 */ "disable-client-cert\0" +/* 1378 */ "Require a client certificate\0" +/* 1407 */ "REQUIRE_CLIENT_CERT\0" +/* 1427 */ "require-client-cert\0" +/* 1447 */ "Activate heartbeat support\0" +/* 1474 */ "HEARTBEAT\0" +/* 1484 */ "heartbeat\0" +/* 1494 */ "Use DER format for certificates to read from\0" +/* 1539 */ "X509FMTDER\0" +/* 1550 */ "x509fmtder\0" +/* 1561 */ "Priorities string\0" +/* 1579 */ "PRIORITY\0" +/* 1588 */ "priority\0" +/* 1597 */ "DH params file to use\0" +/* 1619 */ "DHPARAMS\0" +/* 1628 */ "dhparams\0" +/* 1637 */ "Certificate file or PKCS #11 URL to use\0" +/* 1677 */ "X509CAFILE\0" +/* 1688 */ "x509cafile\0" +/* 1699 */ "CRL file to use\0" +/* 1715 */ "X509CRLFILE\0" +/* 1727 */ "x509crlfile\0" +/* 1739 */ "PGP Key file to use\0" +/* 1759 */ "PGPKEYFILE\0" +/* 1770 */ "pgpkeyfile\0" +/* 1781 */ "PGP Key ring file to use\0" +/* 1806 */ "PGPKEYRING\0" +/* 1817 */ "pgpkeyring\0" +/* 1828 */ "PGP Public Key (certificate) file to use\0" +/* 1869 */ "PGPCERTFILE\0" +/* 1881 */ "pgpcertfile\0" +/* 1893 */ "X.509 key file or PKCS #11 URL to use\0" +/* 1931 */ "X509KEYFILE\0" +/* 1943 */ "x509keyfile\0" +/* 1955 */ "X.509 Certificate file or PKCS #11 URL to use\0" +/* 2001 */ "X509CERTFILE\0" +/* 2014 */ "x509certfile\0" +/* 2027 */ "Alternative X.509 key file or PKCS #11 URL to use\0" +/* 2077 */ "X509DSAKEYFILE\0" +/* 2092 */ "x509dsakeyfile\0" +/* 2107 */ "Alternative X.509 Certificate file or PKCS #11 URL to use\0" +/* 2165 */ "X509DSACERTFILE\0" +/* 2181 */ "x509dsacertfile\0" +/* 2197 */ "X509ECCKEYFILE\0" +/* 2212 */ "x509ecckeyfile\0" +/* 2227 */ "X509ECCCERTFILE\0" +/* 2243 */ "x509ecccertfile\0" +/* 2259 */ "PGP subkey to use (hex or auto)\0" +/* 2291 */ "PGPSUBKEY\0" +/* 2301 */ "pgpsubkey\0" +/* 2311 */ "SRP password file to use\0" +/* 2336 */ "SRPPASSWD\0" +/* 2346 */ "srppasswd\0" +/* 2356 */ "SRP password configuration file to use\0" +/* 2395 */ "SRPPASSWDCONF\0" +/* 2409 */ "srppasswdconf\0" +/* 2423 */ "PSK password file to use\0" +/* 2448 */ "PSKPASSWD\0" +/* 2458 */ "pskpasswd\0" +/* 2468 */ "PSK identity hint to use\0" +/* 2493 */ "PSKHINT\0" +/* 2501 */ "pskhint\0" +/* 2509 */ "The OCSP response to send to client\0" +/* 2545 */ "OCSP_RESPONSE\0" +/* 2559 */ "ocsp-response\0" +/* 2573 */ "The port to connect to\0" +/* 2596 */ "PORT\0" +/* 2601 */ "port\0" +/* 2606 */ "Print a list of the supported algorithms and modes\0" +/* 2657 */ "LIST\0" +/* 2662 */ "list\0" +/* 2667 */ "Display extended usage information and exit\0" +/* 2711 */ "help\0" +/* 2716 */ "Extended usage information passed thru pager\0" +/* 2761 */ "more-help\0" +/* 2771 */ "Output version information and exit\0" +/* 2807 */ "version\0" +/* 2815 */ "GNUTLS_SERV\0" +/* 2827 */ "gnutls-serv - GnuTLS server - Ver. @VERSION@\n" "USAGE: %s [ - [] | --[{=| }] ]...\n\0" -/* 2882 */ "bug-gnutls@gnu.org\0" -/* 2901 */ "\n\n\0" -/* 2904 */ "\n" +/* 2930 */ "bug-gnutls@gnu.org\0" +/* 2949 */ "\n\n\0" +/* 2952 */ "\n" "Server program that listens to incoming TLS connections.\n\0" -/* 2963 */ "gnutls-serv @VERSION@\0" -/* 2985 */ "Usage: gnutls-serv [options]\n" +/* 3011 */ "gnutls-serv @VERSION@\0" +/* 3033 */ "Usage: gnutls-serv [options]\n" "gnutls-serv --help for usage instructions.\n"; /* @@ -275,234 +278,243 @@ static char const gnutls_serv_opt_strs[3058] = #define MTU_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) +/* + * srtp_profiles option description: + */ +#define SRTP_PROFILES_DESC (gnutls_serv_opt_strs+1254) +#define SRTP_PROFILES_NAME (gnutls_serv_opt_strs+1274) +#define SRTP_PROFILES_name (gnutls_serv_opt_strs+1288) +#define SRTP_PROFILES_FLAGS (OPTST_DISABLED \ + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + /* * disable-client-cert option description: */ -#define DISABLE_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1254) -#define DISABLE_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1290) -#define DISABLE_CLIENT_CERT_name (gnutls_serv_opt_strs+1310) +#define DISABLE_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1302) +#define DISABLE_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1338) +#define DISABLE_CLIENT_CERT_name (gnutls_serv_opt_strs+1358) #define DISABLE_CLIENT_CERT_FLAGS (OPTST_DISABLED) /* * require-client-cert option description: */ -#define REQUIRE_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1330) -#define REQUIRE_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1359) -#define REQUIRE_CLIENT_CERT_name (gnutls_serv_opt_strs+1379) +#define REQUIRE_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1378) +#define REQUIRE_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1407) +#define REQUIRE_CLIENT_CERT_name (gnutls_serv_opt_strs+1427) #define REQUIRE_CLIENT_CERT_FLAGS (OPTST_DISABLED) /* * heartbeat option description: */ -#define HEARTBEAT_DESC (gnutls_serv_opt_strs+1399) -#define HEARTBEAT_NAME (gnutls_serv_opt_strs+1426) -#define HEARTBEAT_name (gnutls_serv_opt_strs+1436) +#define HEARTBEAT_DESC (gnutls_serv_opt_strs+1447) +#define HEARTBEAT_NAME (gnutls_serv_opt_strs+1474) +#define HEARTBEAT_name (gnutls_serv_opt_strs+1484) #define HEARTBEAT_FLAGS (OPTST_DISABLED) /* * x509fmtder option description: */ -#define X509FMTDER_DESC (gnutls_serv_opt_strs+1446) -#define X509FMTDER_NAME (gnutls_serv_opt_strs+1491) -#define X509FMTDER_name (gnutls_serv_opt_strs+1502) +#define X509FMTDER_DESC (gnutls_serv_opt_strs+1494) +#define X509FMTDER_NAME (gnutls_serv_opt_strs+1539) +#define X509FMTDER_name (gnutls_serv_opt_strs+1550) #define X509FMTDER_FLAGS (OPTST_DISABLED) /* * priority option description: */ -#define PRIORITY_DESC (gnutls_serv_opt_strs+1513) -#define PRIORITY_NAME (gnutls_serv_opt_strs+1531) -#define PRIORITY_name (gnutls_serv_opt_strs+1540) +#define PRIORITY_DESC (gnutls_serv_opt_strs+1561) +#define PRIORITY_NAME (gnutls_serv_opt_strs+1579) +#define PRIORITY_name (gnutls_serv_opt_strs+1588) #define PRIORITY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * dhparams option description: */ -#define DHPARAMS_DESC (gnutls_serv_opt_strs+1549) -#define DHPARAMS_NAME (gnutls_serv_opt_strs+1571) -#define DHPARAMS_name (gnutls_serv_opt_strs+1580) +#define DHPARAMS_DESC (gnutls_serv_opt_strs+1597) +#define DHPARAMS_NAME (gnutls_serv_opt_strs+1619) +#define DHPARAMS_name (gnutls_serv_opt_strs+1628) #define DHPARAMS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * x509cafile option description: */ -#define X509CAFILE_DESC (gnutls_serv_opt_strs+1589) -#define X509CAFILE_NAME (gnutls_serv_opt_strs+1629) -#define X509CAFILE_name (gnutls_serv_opt_strs+1640) +#define X509CAFILE_DESC (gnutls_serv_opt_strs+1637) +#define X509CAFILE_NAME (gnutls_serv_opt_strs+1677) +#define X509CAFILE_name (gnutls_serv_opt_strs+1688) #define X509CAFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * x509crlfile option description: */ -#define X509CRLFILE_DESC (gnutls_serv_opt_strs+1651) -#define X509CRLFILE_NAME (gnutls_serv_opt_strs+1667) -#define X509CRLFILE_name (gnutls_serv_opt_strs+1679) +#define X509CRLFILE_DESC (gnutls_serv_opt_strs+1699) +#define X509CRLFILE_NAME (gnutls_serv_opt_strs+1715) +#define X509CRLFILE_name (gnutls_serv_opt_strs+1727) #define X509CRLFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * pgpkeyfile option description: */ -#define PGPKEYFILE_DESC (gnutls_serv_opt_strs+1691) -#define PGPKEYFILE_NAME (gnutls_serv_opt_strs+1711) -#define PGPKEYFILE_name (gnutls_serv_opt_strs+1722) +#define PGPKEYFILE_DESC (gnutls_serv_opt_strs+1739) +#define PGPKEYFILE_NAME (gnutls_serv_opt_strs+1759) +#define PGPKEYFILE_name (gnutls_serv_opt_strs+1770) #define PGPKEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * pgpkeyring option description: */ -#define PGPKEYRING_DESC (gnutls_serv_opt_strs+1733) -#define PGPKEYRING_NAME (gnutls_serv_opt_strs+1758) -#define PGPKEYRING_name (gnutls_serv_opt_strs+1769) +#define PGPKEYRING_DESC (gnutls_serv_opt_strs+1781) +#define PGPKEYRING_NAME (gnutls_serv_opt_strs+1806) +#define PGPKEYRING_name (gnutls_serv_opt_strs+1817) #define PGPKEYRING_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * pgpcertfile option description: */ -#define PGPCERTFILE_DESC (gnutls_serv_opt_strs+1780) -#define PGPCERTFILE_NAME (gnutls_serv_opt_strs+1821) -#define PGPCERTFILE_name (gnutls_serv_opt_strs+1833) +#define PGPCERTFILE_DESC (gnutls_serv_opt_strs+1828) +#define PGPCERTFILE_NAME (gnutls_serv_opt_strs+1869) +#define PGPCERTFILE_name (gnutls_serv_opt_strs+1881) #define PGPCERTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * x509keyfile option description: */ -#define X509KEYFILE_DESC (gnutls_serv_opt_strs+1845) -#define X509KEYFILE_NAME (gnutls_serv_opt_strs+1883) -#define X509KEYFILE_name (gnutls_serv_opt_strs+1895) +#define X509KEYFILE_DESC (gnutls_serv_opt_strs+1893) +#define X509KEYFILE_NAME (gnutls_serv_opt_strs+1931) +#define X509KEYFILE_name (gnutls_serv_opt_strs+1943) #define X509KEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * x509certfile option description: */ -#define X509CERTFILE_DESC (gnutls_serv_opt_strs+1907) -#define X509CERTFILE_NAME (gnutls_serv_opt_strs+1953) -#define X509CERTFILE_name (gnutls_serv_opt_strs+1966) +#define X509CERTFILE_DESC (gnutls_serv_opt_strs+1955) +#define X509CERTFILE_NAME (gnutls_serv_opt_strs+2001) +#define X509CERTFILE_name (gnutls_serv_opt_strs+2014) #define X509CERTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * x509dsakeyfile option description: */ -#define X509DSAKEYFILE_DESC (gnutls_serv_opt_strs+1979) -#define X509DSAKEYFILE_NAME (gnutls_serv_opt_strs+2029) -#define X509DSAKEYFILE_name (gnutls_serv_opt_strs+2044) +#define X509DSAKEYFILE_DESC (gnutls_serv_opt_strs+2027) +#define X509DSAKEYFILE_NAME (gnutls_serv_opt_strs+2077) +#define X509DSAKEYFILE_name (gnutls_serv_opt_strs+2092) #define X509DSAKEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * x509dsacertfile option description: */ -#define X509DSACERTFILE_DESC (gnutls_serv_opt_strs+2059) -#define X509DSACERTFILE_NAME (gnutls_serv_opt_strs+2117) -#define X509DSACERTFILE_name (gnutls_serv_opt_strs+2133) +#define X509DSACERTFILE_DESC (gnutls_serv_opt_strs+2107) +#define X509DSACERTFILE_NAME (gnutls_serv_opt_strs+2165) +#define X509DSACERTFILE_name (gnutls_serv_opt_strs+2181) #define X509DSACERTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * x509ecckeyfile option description: */ -#define X509ECCKEYFILE_DESC (gnutls_serv_opt_strs+1979) -#define X509ECCKEYFILE_NAME (gnutls_serv_opt_strs+2149) -#define X509ECCKEYFILE_name (gnutls_serv_opt_strs+2164) +#define X509ECCKEYFILE_DESC (gnutls_serv_opt_strs+2027) +#define X509ECCKEYFILE_NAME (gnutls_serv_opt_strs+2197) +#define X509ECCKEYFILE_name (gnutls_serv_opt_strs+2212) #define X509ECCKEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * x509ecccertfile option description: */ -#define X509ECCCERTFILE_DESC (gnutls_serv_opt_strs+2059) -#define X509ECCCERTFILE_NAME (gnutls_serv_opt_strs+2179) -#define X509ECCCERTFILE_name (gnutls_serv_opt_strs+2195) +#define X509ECCCERTFILE_DESC (gnutls_serv_opt_strs+2107) +#define X509ECCCERTFILE_NAME (gnutls_serv_opt_strs+2227) +#define X509ECCCERTFILE_name (gnutls_serv_opt_strs+2243) #define X509ECCCERTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * pgpsubkey option description: */ -#define PGPSUBKEY_DESC (gnutls_serv_opt_strs+2211) -#define PGPSUBKEY_NAME (gnutls_serv_opt_strs+2243) -#define PGPSUBKEY_name (gnutls_serv_opt_strs+2253) +#define PGPSUBKEY_DESC (gnutls_serv_opt_strs+2259) +#define PGPSUBKEY_NAME (gnutls_serv_opt_strs+2291) +#define PGPSUBKEY_name (gnutls_serv_opt_strs+2301) #define PGPSUBKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * srppasswd option description: */ -#define SRPPASSWD_DESC (gnutls_serv_opt_strs+2263) -#define SRPPASSWD_NAME (gnutls_serv_opt_strs+2288) -#define SRPPASSWD_name (gnutls_serv_opt_strs+2298) +#define SRPPASSWD_DESC (gnutls_serv_opt_strs+2311) +#define SRPPASSWD_NAME (gnutls_serv_opt_strs+2336) +#define SRPPASSWD_name (gnutls_serv_opt_strs+2346) #define SRPPASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * srppasswdconf option description: */ -#define SRPPASSWDCONF_DESC (gnutls_serv_opt_strs+2308) -#define SRPPASSWDCONF_NAME (gnutls_serv_opt_strs+2347) -#define SRPPASSWDCONF_name (gnutls_serv_opt_strs+2361) +#define SRPPASSWDCONF_DESC (gnutls_serv_opt_strs+2356) +#define SRPPASSWDCONF_NAME (gnutls_serv_opt_strs+2395) +#define SRPPASSWDCONF_name (gnutls_serv_opt_strs+2409) #define SRPPASSWDCONF_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * pskpasswd option description: */ -#define PSKPASSWD_DESC (gnutls_serv_opt_strs+2375) -#define PSKPASSWD_NAME (gnutls_serv_opt_strs+2400) -#define PSKPASSWD_name (gnutls_serv_opt_strs+2410) +#define PSKPASSWD_DESC (gnutls_serv_opt_strs+2423) +#define PSKPASSWD_NAME (gnutls_serv_opt_strs+2448) +#define PSKPASSWD_name (gnutls_serv_opt_strs+2458) #define PSKPASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * pskhint option description: */ -#define PSKHINT_DESC (gnutls_serv_opt_strs+2420) -#define PSKHINT_NAME (gnutls_serv_opt_strs+2445) -#define PSKHINT_name (gnutls_serv_opt_strs+2453) +#define PSKHINT_DESC (gnutls_serv_opt_strs+2468) +#define PSKHINT_NAME (gnutls_serv_opt_strs+2493) +#define PSKHINT_name (gnutls_serv_opt_strs+2501) #define PSKHINT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * ocsp-response option description: */ -#define OCSP_RESPONSE_DESC (gnutls_serv_opt_strs+2461) -#define OCSP_RESPONSE_NAME (gnutls_serv_opt_strs+2497) -#define OCSP_RESPONSE_name (gnutls_serv_opt_strs+2511) +#define OCSP_RESPONSE_DESC (gnutls_serv_opt_strs+2509) +#define OCSP_RESPONSE_NAME (gnutls_serv_opt_strs+2545) +#define OCSP_RESPONSE_name (gnutls_serv_opt_strs+2559) #define OCSP_RESPONSE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) /* * port option description: */ -#define PORT_DESC (gnutls_serv_opt_strs+2525) -#define PORT_NAME (gnutls_serv_opt_strs+2548) -#define PORT_name (gnutls_serv_opt_strs+2553) +#define PORT_DESC (gnutls_serv_opt_strs+2573) +#define PORT_NAME (gnutls_serv_opt_strs+2596) +#define PORT_name (gnutls_serv_opt_strs+2601) #define PORT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) /* * list option description: */ -#define LIST_DESC (gnutls_serv_opt_strs+2558) -#define LIST_NAME (gnutls_serv_opt_strs+2609) -#define LIST_name (gnutls_serv_opt_strs+2614) +#define LIST_DESC (gnutls_serv_opt_strs+2606) +#define LIST_NAME (gnutls_serv_opt_strs+2657) +#define LIST_name (gnutls_serv_opt_strs+2662) #define LIST_FLAGS (OPTST_DISABLED) /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (gnutls_serv_opt_strs+2619) -#define HELP_name (gnutls_serv_opt_strs+2663) +#define HELP_DESC (gnutls_serv_opt_strs+2667) +#define HELP_name (gnutls_serv_opt_strs+2711) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (gnutls_serv_opt_strs+2668) -#define MORE_HELP_name (gnutls_serv_opt_strs+2713) +#define MORE_HELP_DESC (gnutls_serv_opt_strs+2716) +#define MORE_HELP_name (gnutls_serv_opt_strs+2761) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC NULL @@ -515,8 +527,8 @@ static char const gnutls_serv_opt_strs[3058] = # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (gnutls_serv_opt_strs+2723) -#define VER_name (gnutls_serv_opt_strs+2759) +#define VER_DESC (gnutls_serv_opt_strs+2771) +#define VER_name (gnutls_serv_opt_strs+2807) /* * Declare option callback procedures */ @@ -647,8 +659,20 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ MTU_DESC, MTU_NAME, MTU_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 9, VALUE_OPT_DISABLE_CLIENT_CERT, - /* equiv idx, value */ 9, VALUE_OPT_DISABLE_CLIENT_CERT, + { /* entry idx, value */ 9, VALUE_OPT_SRTP_PROFILES, + /* equiv idx, value */ 9, VALUE_OPT_SRTP_PROFILES, + /* equivalenced to */ NO_EQUIVALENT, + /* min, max, act ct */ 0, 1, 0, + /* opt state flags */ SRTP_PROFILES_FLAGS, 0, + /* last opt argumnt */ { NULL }, /* --srtp_profiles */ + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, NULL, + /* option proc */ NULL, + /* desc, NAME, name */ SRTP_PROFILES_DESC, SRTP_PROFILES_NAME, SRTP_PROFILES_name, + /* disablement strs */ NULL, NULL }, + + { /* entry idx, value */ 10, VALUE_OPT_DISABLE_CLIENT_CERT, + /* equiv idx, value */ 10, VALUE_OPT_DISABLE_CLIENT_CERT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ DISABLE_CLIENT_CERT_FLAGS, 0, @@ -659,8 +683,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ DISABLE_CLIENT_CERT_DESC, DISABLE_CLIENT_CERT_NAME, DISABLE_CLIENT_CERT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 10, VALUE_OPT_REQUIRE_CLIENT_CERT, - /* equiv idx, value */ 10, VALUE_OPT_REQUIRE_CLIENT_CERT, + { /* entry idx, value */ 11, VALUE_OPT_REQUIRE_CLIENT_CERT, + /* equiv idx, value */ 11, VALUE_OPT_REQUIRE_CLIENT_CERT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ REQUIRE_CLIENT_CERT_FLAGS, 0, @@ -671,8 +695,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ REQUIRE_CLIENT_CERT_DESC, REQUIRE_CLIENT_CERT_NAME, REQUIRE_CLIENT_CERT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 11, VALUE_OPT_HEARTBEAT, - /* equiv idx, value */ 11, VALUE_OPT_HEARTBEAT, + { /* entry idx, value */ 12, VALUE_OPT_HEARTBEAT, + /* equiv idx, value */ 12, VALUE_OPT_HEARTBEAT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ HEARTBEAT_FLAGS, 0, @@ -683,8 +707,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ HEARTBEAT_DESC, HEARTBEAT_NAME, HEARTBEAT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 12, VALUE_OPT_X509FMTDER, - /* equiv idx, value */ 12, VALUE_OPT_X509FMTDER, + { /* entry idx, value */ 13, VALUE_OPT_X509FMTDER, + /* equiv idx, value */ 13, VALUE_OPT_X509FMTDER, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509FMTDER_FLAGS, 0, @@ -695,8 +719,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509FMTDER_DESC, X509FMTDER_NAME, X509FMTDER_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 13, VALUE_OPT_PRIORITY, - /* equiv idx, value */ 13, VALUE_OPT_PRIORITY, + { /* entry idx, value */ 14, VALUE_OPT_PRIORITY, + /* equiv idx, value */ 14, VALUE_OPT_PRIORITY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PRIORITY_FLAGS, 0, @@ -707,8 +731,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PRIORITY_DESC, PRIORITY_NAME, PRIORITY_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 14, VALUE_OPT_DHPARAMS, - /* equiv idx, value */ 14, VALUE_OPT_DHPARAMS, + { /* entry idx, value */ 15, VALUE_OPT_DHPARAMS, + /* equiv idx, value */ 15, VALUE_OPT_DHPARAMS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ DHPARAMS_FLAGS, 0, @@ -719,8 +743,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ DHPARAMS_DESC, DHPARAMS_NAME, DHPARAMS_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 15, VALUE_OPT_X509CAFILE, - /* equiv idx, value */ 15, VALUE_OPT_X509CAFILE, + { /* entry idx, value */ 16, VALUE_OPT_X509CAFILE, + /* equiv idx, value */ 16, VALUE_OPT_X509CAFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509CAFILE_FLAGS, 0, @@ -731,8 +755,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509CAFILE_DESC, X509CAFILE_NAME, X509CAFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 16, VALUE_OPT_X509CRLFILE, - /* equiv idx, value */ 16, VALUE_OPT_X509CRLFILE, + { /* entry idx, value */ 17, VALUE_OPT_X509CRLFILE, + /* equiv idx, value */ 17, VALUE_OPT_X509CRLFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509CRLFILE_FLAGS, 0, @@ -743,8 +767,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509CRLFILE_DESC, X509CRLFILE_NAME, X509CRLFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 17, VALUE_OPT_PGPKEYFILE, - /* equiv idx, value */ 17, VALUE_OPT_PGPKEYFILE, + { /* entry idx, value */ 18, VALUE_OPT_PGPKEYFILE, + /* equiv idx, value */ 18, VALUE_OPT_PGPKEYFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PGPKEYFILE_FLAGS, 0, @@ -755,8 +779,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PGPKEYFILE_DESC, PGPKEYFILE_NAME, PGPKEYFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 18, VALUE_OPT_PGPKEYRING, - /* equiv idx, value */ 18, VALUE_OPT_PGPKEYRING, + { /* entry idx, value */ 19, VALUE_OPT_PGPKEYRING, + /* equiv idx, value */ 19, VALUE_OPT_PGPKEYRING, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PGPKEYRING_FLAGS, 0, @@ -767,8 +791,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PGPKEYRING_DESC, PGPKEYRING_NAME, PGPKEYRING_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 19, VALUE_OPT_PGPCERTFILE, - /* equiv idx, value */ 19, VALUE_OPT_PGPCERTFILE, + { /* entry idx, value */ 20, VALUE_OPT_PGPCERTFILE, + /* equiv idx, value */ 20, VALUE_OPT_PGPCERTFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PGPCERTFILE_FLAGS, 0, @@ -779,8 +803,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PGPCERTFILE_DESC, PGPCERTFILE_NAME, PGPCERTFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 20, VALUE_OPT_X509KEYFILE, - /* equiv idx, value */ 20, VALUE_OPT_X509KEYFILE, + { /* entry idx, value */ 21, VALUE_OPT_X509KEYFILE, + /* equiv idx, value */ 21, VALUE_OPT_X509KEYFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509KEYFILE_FLAGS, 0, @@ -791,8 +815,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509KEYFILE_DESC, X509KEYFILE_NAME, X509KEYFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 21, VALUE_OPT_X509CERTFILE, - /* equiv idx, value */ 21, VALUE_OPT_X509CERTFILE, + { /* entry idx, value */ 22, VALUE_OPT_X509CERTFILE, + /* equiv idx, value */ 22, VALUE_OPT_X509CERTFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509CERTFILE_FLAGS, 0, @@ -803,8 +827,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509CERTFILE_DESC, X509CERTFILE_NAME, X509CERTFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 22, VALUE_OPT_X509DSAKEYFILE, - /* equiv idx, value */ 22, VALUE_OPT_X509DSAKEYFILE, + { /* entry idx, value */ 23, VALUE_OPT_X509DSAKEYFILE, + /* equiv idx, value */ 23, VALUE_OPT_X509DSAKEYFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509DSAKEYFILE_FLAGS, 0, @@ -815,8 +839,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509DSAKEYFILE_DESC, X509DSAKEYFILE_NAME, X509DSAKEYFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 23, VALUE_OPT_X509DSACERTFILE, - /* equiv idx, value */ 23, VALUE_OPT_X509DSACERTFILE, + { /* entry idx, value */ 24, VALUE_OPT_X509DSACERTFILE, + /* equiv idx, value */ 24, VALUE_OPT_X509DSACERTFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509DSACERTFILE_FLAGS, 0, @@ -827,8 +851,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509DSACERTFILE_DESC, X509DSACERTFILE_NAME, X509DSACERTFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 24, VALUE_OPT_X509ECCKEYFILE, - /* equiv idx, value */ 24, VALUE_OPT_X509ECCKEYFILE, + { /* entry idx, value */ 25, VALUE_OPT_X509ECCKEYFILE, + /* equiv idx, value */ 25, VALUE_OPT_X509ECCKEYFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509ECCKEYFILE_FLAGS, 0, @@ -839,8 +863,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509ECCKEYFILE_DESC, X509ECCKEYFILE_NAME, X509ECCKEYFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 25, VALUE_OPT_X509ECCCERTFILE, - /* equiv idx, value */ 25, VALUE_OPT_X509ECCCERTFILE, + { /* entry idx, value */ 26, VALUE_OPT_X509ECCCERTFILE, + /* equiv idx, value */ 26, VALUE_OPT_X509ECCCERTFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ X509ECCCERTFILE_FLAGS, 0, @@ -851,8 +875,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ X509ECCCERTFILE_DESC, X509ECCCERTFILE_NAME, X509ECCCERTFILE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 26, VALUE_OPT_PGPSUBKEY, - /* equiv idx, value */ 26, VALUE_OPT_PGPSUBKEY, + { /* entry idx, value */ 27, VALUE_OPT_PGPSUBKEY, + /* equiv idx, value */ 27, VALUE_OPT_PGPSUBKEY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PGPSUBKEY_FLAGS, 0, @@ -863,8 +887,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PGPSUBKEY_DESC, PGPSUBKEY_NAME, PGPSUBKEY_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 27, VALUE_OPT_SRPPASSWD, - /* equiv idx, value */ 27, VALUE_OPT_SRPPASSWD, + { /* entry idx, value */ 28, VALUE_OPT_SRPPASSWD, + /* equiv idx, value */ 28, VALUE_OPT_SRPPASSWD, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SRPPASSWD_FLAGS, 0, @@ -875,8 +899,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SRPPASSWD_DESC, SRPPASSWD_NAME, SRPPASSWD_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 28, VALUE_OPT_SRPPASSWDCONF, - /* equiv idx, value */ 28, VALUE_OPT_SRPPASSWDCONF, + { /* entry idx, value */ 29, VALUE_OPT_SRPPASSWDCONF, + /* equiv idx, value */ 29, VALUE_OPT_SRPPASSWDCONF, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SRPPASSWDCONF_FLAGS, 0, @@ -887,8 +911,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ SRPPASSWDCONF_DESC, SRPPASSWDCONF_NAME, SRPPASSWDCONF_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 29, VALUE_OPT_PSKPASSWD, - /* equiv idx, value */ 29, VALUE_OPT_PSKPASSWD, + { /* entry idx, value */ 30, VALUE_OPT_PSKPASSWD, + /* equiv idx, value */ 30, VALUE_OPT_PSKPASSWD, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PSKPASSWD_FLAGS, 0, @@ -899,8 +923,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PSKPASSWD_DESC, PSKPASSWD_NAME, PSKPASSWD_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 30, VALUE_OPT_PSKHINT, - /* equiv idx, value */ 30, VALUE_OPT_PSKHINT, + { /* entry idx, value */ 31, VALUE_OPT_PSKHINT, + /* equiv idx, value */ 31, VALUE_OPT_PSKHINT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PSKHINT_FLAGS, 0, @@ -911,8 +935,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PSKHINT_DESC, PSKHINT_NAME, PSKHINT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 31, VALUE_OPT_OCSP_RESPONSE, - /* equiv idx, value */ 31, VALUE_OPT_OCSP_RESPONSE, + { /* entry idx, value */ 32, VALUE_OPT_OCSP_RESPONSE, + /* equiv idx, value */ 32, VALUE_OPT_OCSP_RESPONSE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OCSP_RESPONSE_FLAGS, 0, @@ -923,8 +947,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ OCSP_RESPONSE_DESC, OCSP_RESPONSE_NAME, OCSP_RESPONSE_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 32, VALUE_OPT_PORT, - /* equiv idx, value */ 32, VALUE_OPT_PORT, + { /* entry idx, value */ 33, VALUE_OPT_PORT, + /* equiv idx, value */ 33, VALUE_OPT_PORT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PORT_FLAGS, 0, @@ -935,8 +959,8 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PORT_DESC, PORT_NAME, PORT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 33, VALUE_OPT_LIST, - /* equiv idx, value */ 33, VALUE_OPT_LIST, + { /* entry idx, value */ 34, VALUE_OPT_LIST, + /* equiv idx, value */ 34, VALUE_OPT_LIST, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ LIST_FLAGS, 0, @@ -991,14 +1015,14 @@ static tOptDesc optDesc[OPTION_CT] = { * * Define the gnutls-serv Option Environment */ -#define zPROGNAME (gnutls_serv_opt_strs+2767) -#define zUsageTitle (gnutls_serv_opt_strs+2779) +#define zPROGNAME (gnutls_serv_opt_strs+2815) +#define zUsageTitle (gnutls_serv_opt_strs+2827) #define zRcName NULL #define apzHomeList NULL -#define zBugsAddr (gnutls_serv_opt_strs+2882) -#define zExplain (gnutls_serv_opt_strs+2901) -#define zDetail (gnutls_serv_opt_strs+2904) -#define zFullVersion (gnutls_serv_opt_strs+2963) +#define zBugsAddr (gnutls_serv_opt_strs+2930) +#define zExplain (gnutls_serv_opt_strs+2949) +#define zDetail (gnutls_serv_opt_strs+2952) +#define zFullVersion (gnutls_serv_opt_strs+3011) /* extracted from optcode.tlib near line 350 */ #if defined(ENABLE_NLS) @@ -1012,7 +1036,7 @@ static tOptDesc optDesc[OPTION_CT] = { #define gnutls_serv_full_usage (NULL) -#define gnutls_serv_short_usage (gnutls_serv_opt_strs+2985) +#define gnutls_serv_short_usage (gnutls_serv_opt_strs+3033) #endif /* not defined __doxygen__ */ @@ -1358,7 +1382,7 @@ tOptions gnutls_servOptions = { NO_EQUIVALENT, /* '-#' option index */ NO_EQUIVALENT /* index of default opt */ }, - 37 /* full option count */, 34 /* user option count */, + 38 /* full option count */, 35 /* user option count */, gnutls_serv_full_usage, gnutls_serv_short_usage, NULL, NULL, PKGDATADIR, gnutls_serv_packager_info diff --git a/src/serv-args.h b/src/serv-args.h index 8ff5e1e3be..63e7ff80b3 100644 --- a/src/serv-args.h +++ b/src/serv-args.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (serv-args.h) * - * It has been AutoGen-ed September 30, 2012 at 03:29:31 PM by AutoGen 5.16 + * It has been AutoGen-ed November 1, 2012 at 03:36:17 PM by AutoGen 5.16 * From the definitions serv-args.def * and the template file options * @@ -76,37 +76,38 @@ typedef enum { INDEX_OPT_ECHO = 6, INDEX_OPT_UDP = 7, INDEX_OPT_MTU = 8, - INDEX_OPT_DISABLE_CLIENT_CERT = 9, - INDEX_OPT_REQUIRE_CLIENT_CERT = 10, - INDEX_OPT_HEARTBEAT = 11, - INDEX_OPT_X509FMTDER = 12, - INDEX_OPT_PRIORITY = 13, - INDEX_OPT_DHPARAMS = 14, - INDEX_OPT_X509CAFILE = 15, - INDEX_OPT_X509CRLFILE = 16, - INDEX_OPT_PGPKEYFILE = 17, - INDEX_OPT_PGPKEYRING = 18, - INDEX_OPT_PGPCERTFILE = 19, - INDEX_OPT_X509KEYFILE = 20, - INDEX_OPT_X509CERTFILE = 21, - INDEX_OPT_X509DSAKEYFILE = 22, - INDEX_OPT_X509DSACERTFILE = 23, - INDEX_OPT_X509ECCKEYFILE = 24, - INDEX_OPT_X509ECCCERTFILE = 25, - INDEX_OPT_PGPSUBKEY = 26, - INDEX_OPT_SRPPASSWD = 27, - INDEX_OPT_SRPPASSWDCONF = 28, - INDEX_OPT_PSKPASSWD = 29, - INDEX_OPT_PSKHINT = 30, - INDEX_OPT_OCSP_RESPONSE = 31, - INDEX_OPT_PORT = 32, - INDEX_OPT_LIST = 33, - INDEX_OPT_VERSION = 34, - INDEX_OPT_HELP = 35, - INDEX_OPT_MORE_HELP = 36 + INDEX_OPT_SRTP_PROFILES = 9, + INDEX_OPT_DISABLE_CLIENT_CERT = 10, + INDEX_OPT_REQUIRE_CLIENT_CERT = 11, + INDEX_OPT_HEARTBEAT = 12, + INDEX_OPT_X509FMTDER = 13, + INDEX_OPT_PRIORITY = 14, + INDEX_OPT_DHPARAMS = 15, + INDEX_OPT_X509CAFILE = 16, + INDEX_OPT_X509CRLFILE = 17, + INDEX_OPT_PGPKEYFILE = 18, + INDEX_OPT_PGPKEYRING = 19, + INDEX_OPT_PGPCERTFILE = 20, + INDEX_OPT_X509KEYFILE = 21, + INDEX_OPT_X509CERTFILE = 22, + INDEX_OPT_X509DSAKEYFILE = 23, + INDEX_OPT_X509DSACERTFILE = 24, + INDEX_OPT_X509ECCKEYFILE = 25, + INDEX_OPT_X509ECCCERTFILE = 26, + INDEX_OPT_PGPSUBKEY = 27, + INDEX_OPT_SRPPASSWD = 28, + INDEX_OPT_SRPPASSWDCONF = 29, + INDEX_OPT_PSKPASSWD = 30, + INDEX_OPT_PSKHINT = 31, + INDEX_OPT_OCSP_RESPONSE = 32, + INDEX_OPT_PORT = 33, + INDEX_OPT_LIST = 34, + INDEX_OPT_VERSION = 35, + INDEX_OPT_HELP = 36, + INDEX_OPT_MORE_HELP = 37 } teOptIndex; -#define OPTION_CT 37 +#define OPTION_CT 38 #define GNUTLS_SERV_VERSION "@VERSION@" #define GNUTLS_SERV_FULL_VERSION "gnutls-serv @VERSION@" @@ -157,29 +158,30 @@ typedef enum { #define VALUE_OPT_MTU 8 #define OPT_VALUE_MTU (DESC(MTU).optArg.argInt) +#define VALUE_OPT_SRTP_PROFILES 9 #define VALUE_OPT_DISABLE_CLIENT_CERT 'a' #define VALUE_OPT_REQUIRE_CLIENT_CERT 'r' #define VALUE_OPT_HEARTBEAT 'b' -#define VALUE_OPT_X509FMTDER 12 -#define VALUE_OPT_PRIORITY 13 -#define VALUE_OPT_DHPARAMS 14 -#define VALUE_OPT_X509CAFILE 15 -#define VALUE_OPT_X509CRLFILE 16 -#define VALUE_OPT_PGPKEYFILE 17 -#define VALUE_OPT_PGPKEYRING 18 -#define VALUE_OPT_PGPCERTFILE 19 -#define VALUE_OPT_X509KEYFILE 20 -#define VALUE_OPT_X509CERTFILE 21 -#define VALUE_OPT_X509DSAKEYFILE 22 -#define VALUE_OPT_X509DSACERTFILE 23 -#define VALUE_OPT_X509ECCKEYFILE 24 -#define VALUE_OPT_X509ECCCERTFILE 25 -#define VALUE_OPT_PGPSUBKEY 26 -#define VALUE_OPT_SRPPASSWD 27 -#define VALUE_OPT_SRPPASSWDCONF 28 -#define VALUE_OPT_PSKPASSWD 29 -#define VALUE_OPT_PSKHINT 30 -#define VALUE_OPT_OCSP_RESPONSE 31 +#define VALUE_OPT_X509FMTDER 13 +#define VALUE_OPT_PRIORITY 14 +#define VALUE_OPT_DHPARAMS 15 +#define VALUE_OPT_X509CAFILE 16 +#define VALUE_OPT_X509CRLFILE 17 +#define VALUE_OPT_PGPKEYFILE 18 +#define VALUE_OPT_PGPKEYRING 19 +#define VALUE_OPT_PGPCERTFILE 20 +#define VALUE_OPT_X509KEYFILE 21 +#define VALUE_OPT_X509CERTFILE 22 +#define VALUE_OPT_X509DSAKEYFILE 23 +#define VALUE_OPT_X509DSACERTFILE 24 +#define VALUE_OPT_X509ECCKEYFILE 25 +#define VALUE_OPT_X509ECCCERTFILE 26 +#define VALUE_OPT_PGPSUBKEY 27 +#define VALUE_OPT_SRPPASSWD 28 +#define VALUE_OPT_SRPPASSWDCONF 29 +#define VALUE_OPT_PSKPASSWD 30 +#define VALUE_OPT_PSKHINT 31 +#define VALUE_OPT_OCSP_RESPONSE 32 #define VALUE_OPT_PORT 'p' #define OPT_VALUE_PORT (DESC(PORT).optArg.argInt)