diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-07-11 19:45:40 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-07-25 08:35:39 -0400 |
| commit | 55e0d0b46206b4af377bba325acf8dba0fd50b3f (patch) | |
| tree | 00ef49d6b6608edfaaa8573343f376ab0078e8ab /apps | |
| parent | 67c93e6d9f3e099f3120bcc48cfd0c190364d628 (diff) | |
Discard a dead option
Old inactive inherited code, a code relic for sure.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1301)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_server.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index cd7155bf93..22ee01881e 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -151,7 +151,7 @@ static const char *session_id_prefix = NULL; #ifndef OPENSSL_NO_DTLS static int enable_timeouts = 0; static long socket_mtu; -static int cert_chain = 0; + #endif static int dtlslisten = 0; @@ -713,7 +713,7 @@ typedef enum OPTION_choice { OPT_SRPUSERSEED, OPT_REV, OPT_WWW, OPT_UPPER_WWW, OPT_HTTP, OPT_ASYNC, OPT_SSL_CONFIG, OPT_SPLIT_SEND_FRAG, OPT_MAX_PIPELINES, OPT_READ_BUF, OPT_SSL3, OPT_TLS1_2, OPT_TLS1_1, OPT_TLS1, OPT_DTLS, OPT_DTLS1, - OPT_DTLS1_2, OPT_TIMEOUT, OPT_MTU, OPT_CHAIN, OPT_LISTEN, + OPT_DTLS1_2, OPT_TIMEOUT, OPT_MTU, OPT_LISTEN, OPT_ID_PREFIX, OPT_RAND, OPT_SERVERNAME, OPT_SERVERNAME_FATAL, OPT_CERT2, OPT_KEY2, OPT_NEXTPROTONEG, OPT_ALPN, OPT_SRTP_PROFILES, OPT_KEYMATEXPORT, OPT_KEYMATEXPORTLEN, @@ -881,7 +881,6 @@ OPTIONS s_server_options[] = { {"dtls", OPT_DTLS, '-', "Use any DTLS version"}, {"timeout", OPT_TIMEOUT, '-', "Enable timeouts"}, {"mtu", OPT_MTU, 'p', "Set link layer MTU"}, - {"chain", OPT_CHAIN, '-', "Read a certificate chain"}, {"listen", OPT_LISTEN, '-', "Listen for a DTLS ClientHello with a cookie and then connect"}, #endif @@ -1385,11 +1384,6 @@ int s_server_main(int argc, char *argv[]) socket_mtu = atol(opt_arg()); #endif break; - case OPT_CHAIN: -#ifndef OPENSSL_NO_DTLS - cert_chain = 1; -#endif - break; case OPT_LISTEN: #ifndef OPENSSL_NO_DTLS dtlslisten = 1; |