diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-03-27 15:51:25 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-03-27 16:12:40 +0000 |
| commit | f0ef019da28a7b8ad81f65c2fbd2fcc9c88e5c52 (patch) | |
| tree | f1f6bdab93982af1613fc88582bcca5c00d2c01b /apps | |
| parent | e970f63dc028e32df50fa7135e5e0334afa24d83 (diff) | |
Add -no_resumption_on_reneg to SSL_CONF.
(cherry picked from commit 1f44dac24d1cb752b1a06be9091bb03a88a8598e)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_server.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index f757f3caa1..eb3c866963 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1058,7 +1058,6 @@ int MAIN(int argc, char *argv[]) EVP_PKEY *s_key = NULL, *s_dkey = NULL; int no_cache = 0, ext_cache = 0; int rev = 0, naccept = -1; - int c_no_resumption_on_reneg = 0; #ifndef OPENSSL_NO_TLSEXT EVP_PKEY *s_key2 = NULL; X509 *s_cert2 = NULL; @@ -1183,10 +1182,6 @@ int MAIN(int argc, char *argv[]) c_auth = 1; } #endif - else if (strcmp(*argv, "-no_resumption_on_reneg") == 0) - { - c_no_resumption_on_reneg = 1; - } else if (strcmp(*argv,"-auth_require_reneg") == 0) { c_auth_require_reneg = 1; @@ -1963,8 +1958,6 @@ bad: } #endif - if (c_no_resumption_on_reneg) - SSL_CTX_set_options(ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION); if (!set_cert_key_stuff(ctx, s_cert, s_key, s_chain, build_chain)) goto end; #ifndef OPENSSL_NO_TLSEXT |