summaryrefslogtreecommitdiffstats
path: root/apps/s_server.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2021-06-13 10:49:47 -0400
committerTomas Mraz <tomas@openssl.org>2021-06-15 12:36:51 +0200
commit5bbe2134188a45a937e7aefd46b7eeee258d0ab8 (patch)
tree9c122ebcd8a8f15601669542458e112052e4c297 /apps/s_server.c
parentf4752e88272933777dbdbda31d00b388fa5a8e2d (diff)
Remove "-immedate_renegotiation" option
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15415)
Diffstat (limited to 'apps/s_server.c')
-rw-r--r--apps/s_server.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/apps/s_server.c b/apps/s_server.c
index 009ac5a1eb..e32d25e800 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -78,7 +78,6 @@ static int accept_socket = -1;
static int s_nbio = 0;
static int s_nbio_test = 0;
static int s_crlf = 0;
-static int immediate_reneg = 0;
static SSL_CTX *ctx = NULL;
static SSL_CTX *ctx2 = NULL;
static int www = 0;
@@ -1270,9 +1269,6 @@ int s_server_main(int argc, char *argv[])
if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &crl_format))
goto opthelp;
break;
- case OPT_S_IMMEDIATE_RENEG:
- immediate_reneg = 1;
- break;
case OPT_S_CASES:
case OPT_S_NUM_TICKETS:
case OPT_ANTI_REPLAY:
@@ -2811,8 +2807,6 @@ static int init_ssl_connection(SSL *con)
} else {
do {
i = SSL_accept(con);
- if (immediate_reneg)
- SSL_renegotiate(con);
if (i <= 0)
retry = is_retryable(con, i);