diff options
Diffstat (limited to 'src/serv-args.h.bak')
| -rw-r--r-- | src/serv-args.h.bak | 128 |
1 files changed, 66 insertions, 62 deletions
diff --git a/src/serv-args.h.bak b/src/serv-args.h.bak index 043818aa7c..a40e0f8259 100644 --- a/src/serv-args.h.bak +++ b/src/serv-args.h.bak @@ -69,45 +69,47 @@ typedef enum { INDEX_OPT_DEBUG = 0, INDEX_OPT_SNI_HOSTNAME = 1, INDEX_OPT_SNI_HOSTNAME_FATAL = 2, - INDEX_OPT_NOTICKET = 3, - INDEX_OPT_GENERATE = 4, - INDEX_OPT_QUIET = 5, - INDEX_OPT_NODB = 6, - INDEX_OPT_HTTP = 7, - INDEX_OPT_ECHO = 8, - INDEX_OPT_UDP = 9, - INDEX_OPT_MTU = 10, - INDEX_OPT_SRTP_PROFILES = 11, - INDEX_OPT_DISABLE_CLIENT_CERT = 12, - INDEX_OPT_REQUIRE_CLIENT_CERT = 13, - INDEX_OPT_VERIFY_CLIENT_CERT = 14, - INDEX_OPT_HEARTBEAT = 15, - INDEX_OPT_X509FMTDER = 16, - INDEX_OPT_PRIORITY = 17, - INDEX_OPT_DHPARAMS = 18, - INDEX_OPT_X509CAFILE = 19, - INDEX_OPT_X509CRLFILE = 20, - INDEX_OPT_PGPKEYFILE = 21, - INDEX_OPT_X509KEYFILE = 22, - INDEX_OPT_X509CERTFILE = 23, - INDEX_OPT_X509DSAKEYFILE = 24, - INDEX_OPT_X509DSACERTFILE = 25, - INDEX_OPT_X509ECCKEYFILE = 26, - INDEX_OPT_X509ECCCERTFILE = 27, - INDEX_OPT_SRPPASSWD = 28, - INDEX_OPT_SRPPASSWDCONF = 29, - INDEX_OPT_PSKPASSWD = 30, - INDEX_OPT_PSKHINT = 31, - INDEX_OPT_OCSP_RESPONSE = 32, - INDEX_OPT_PORT = 33, - INDEX_OPT_LIST = 34, - INDEX_OPT_PROVIDER = 35, - INDEX_OPT_VERSION = 36, - INDEX_OPT_HELP = 37, - INDEX_OPT_MORE_HELP = 38 + INDEX_OPT_ALPN = 3, + INDEX_OPT_ALPN_FATAL = 4, + INDEX_OPT_NOTICKET = 5, + INDEX_OPT_GENERATE = 6, + INDEX_OPT_QUIET = 7, + INDEX_OPT_NODB = 8, + INDEX_OPT_HTTP = 9, + INDEX_OPT_ECHO = 10, + INDEX_OPT_UDP = 11, + INDEX_OPT_MTU = 12, + INDEX_OPT_SRTP_PROFILES = 13, + INDEX_OPT_DISABLE_CLIENT_CERT = 14, + INDEX_OPT_REQUIRE_CLIENT_CERT = 15, + INDEX_OPT_VERIFY_CLIENT_CERT = 16, + INDEX_OPT_HEARTBEAT = 17, + INDEX_OPT_X509FMTDER = 18, + INDEX_OPT_PRIORITY = 19, + INDEX_OPT_DHPARAMS = 20, + INDEX_OPT_X509CAFILE = 21, + INDEX_OPT_X509CRLFILE = 22, + INDEX_OPT_PGPKEYFILE = 23, + INDEX_OPT_X509KEYFILE = 24, + INDEX_OPT_X509CERTFILE = 25, + INDEX_OPT_X509DSAKEYFILE = 26, + INDEX_OPT_X509DSACERTFILE = 27, + INDEX_OPT_X509ECCKEYFILE = 28, + INDEX_OPT_X509ECCCERTFILE = 29, + INDEX_OPT_SRPPASSWD = 30, + INDEX_OPT_SRPPASSWDCONF = 31, + INDEX_OPT_PSKPASSWD = 32, + INDEX_OPT_PSKHINT = 33, + INDEX_OPT_OCSP_RESPONSE = 34, + INDEX_OPT_PORT = 35, + INDEX_OPT_LIST = 36, + INDEX_OPT_PROVIDER = 37, + INDEX_OPT_VERSION = 38, + INDEX_OPT_HELP = 39, + INDEX_OPT_MORE_HELP = 40 } teOptIndex; /** count of all options for gnutls-serv */ -#define OPTION_CT 39 +#define OPTION_CT 41 /** gnutls-serv version */ #define GNUTLS_SERV_VERSION "@VERSION@" /** Full gnutls-serv version text */ @@ -167,43 +169,45 @@ typedef enum { #define OPT_VALUE_DEBUG (DESC(DEBUG).optArg.argInt) #define VALUE_OPT_SNI_HOSTNAME 0x1001 #define VALUE_OPT_SNI_HOSTNAME_FATAL 0x1002 -#define VALUE_OPT_NOTICKET 0x1003 +#define VALUE_OPT_ALPN 0x1003 +#define VALUE_OPT_ALPN_FATAL 0x1004 +#define VALUE_OPT_NOTICKET 0x1005 #define VALUE_OPT_GENERATE 'g' #define VALUE_OPT_QUIET 'q' -#define VALUE_OPT_NODB 0x1004 -#define VALUE_OPT_HTTP 0x1005 -#define VALUE_OPT_ECHO 0x1006 +#define VALUE_OPT_NODB 0x1006 +#define VALUE_OPT_HTTP 0x1007 +#define VALUE_OPT_ECHO 0x1008 #define VALUE_OPT_UDP 'u' -#define VALUE_OPT_MTU 0x1007 +#define VALUE_OPT_MTU 0x1009 #define OPT_VALUE_MTU (DESC(MTU).optArg.argInt) -#define VALUE_OPT_SRTP_PROFILES 0x1008 +#define VALUE_OPT_SRTP_PROFILES 0x100A #define VALUE_OPT_DISABLE_CLIENT_CERT 'a' #define VALUE_OPT_REQUIRE_CLIENT_CERT 'r' -#define VALUE_OPT_VERIFY_CLIENT_CERT 0x1009 +#define VALUE_OPT_VERIFY_CLIENT_CERT 0x100B #define VALUE_OPT_HEARTBEAT 'b' -#define VALUE_OPT_X509FMTDER 0x100A -#define VALUE_OPT_PRIORITY 0x100B -#define VALUE_OPT_DHPARAMS 0x100C -#define VALUE_OPT_X509CAFILE 0x100D -#define VALUE_OPT_X509CRLFILE 0x100E -#define VALUE_OPT_PGPKEYFILE 0x100F -#define VALUE_OPT_X509KEYFILE 0x1010 -#define VALUE_OPT_X509CERTFILE 0x1011 -#define VALUE_OPT_X509DSAKEYFILE 0x1012 -#define VALUE_OPT_X509DSACERTFILE 0x1013 -#define VALUE_OPT_X509ECCKEYFILE 0x1014 -#define VALUE_OPT_X509ECCCERTFILE 0x1015 -#define VALUE_OPT_SRPPASSWD 0x1016 -#define VALUE_OPT_SRPPASSWDCONF 0x1017 -#define VALUE_OPT_PSKPASSWD 0x1018 -#define VALUE_OPT_PSKHINT 0x1019 -#define VALUE_OPT_OCSP_RESPONSE 0x101A +#define VALUE_OPT_X509FMTDER 0x100C +#define VALUE_OPT_PRIORITY 0x100D +#define VALUE_OPT_DHPARAMS 0x100E +#define VALUE_OPT_X509CAFILE 0x100F +#define VALUE_OPT_X509CRLFILE 0x1010 +#define VALUE_OPT_PGPKEYFILE 0x1011 +#define VALUE_OPT_X509KEYFILE 0x1012 +#define VALUE_OPT_X509CERTFILE 0x1013 +#define VALUE_OPT_X509DSAKEYFILE 0x1014 +#define VALUE_OPT_X509DSACERTFILE 0x1015 +#define VALUE_OPT_X509ECCKEYFILE 0x1016 +#define VALUE_OPT_X509ECCCERTFILE 0x1017 +#define VALUE_OPT_SRPPASSWD 0x1018 +#define VALUE_OPT_SRPPASSWDCONF 0x1019 +#define VALUE_OPT_PSKPASSWD 0x101A +#define VALUE_OPT_PSKHINT 0x101B +#define VALUE_OPT_OCSP_RESPONSE 0x101C #define VALUE_OPT_PORT 'p' #define OPT_VALUE_PORT (DESC(PORT).optArg.argInt) #define VALUE_OPT_LIST 'l' -#define VALUE_OPT_PROVIDER 0x101B +#define VALUE_OPT_PROVIDER 0x101D /** option flag (value) for help-value option */ #define VALUE_OPT_HELP 'h' /** option flag (value) for more-help-value option */ |