diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-05-05 15:26:32 +0300 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-05-06 17:53:17 +0300 |
| commit | edbb56ee4fafc07eb77747ad25278a04b89adc09 (patch) | |
| tree | f97db0243c7d4e30f15c4facb546b48bf9bcc44d /apps/s_server.c | |
| parent | a96e6c347bc1da9964ffe941608b11cf030320ef (diff) | |
s_server normal shutdown
Partially fixes #11209
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11734)
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 23c762ba9f..4904a21b7a 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1884,7 +1884,6 @@ int s_server_main(int argc, char *argv[]) } BIO_printf(bio_err, "id_prefix '%s' set.\n", session_id_prefix); } - SSL_CTX_set_quiet_shutdown(ctx, 1); if (exc != NULL) ssl_ctx_set_excert(ctx, exc); @@ -1982,7 +1981,6 @@ int s_server_main(int argc, char *argv[]) } BIO_printf(bio_err, "id_prefix '%s' set.\n", session_id_prefix); } - SSL_CTX_set_quiet_shutdown(ctx2, 1); if (exc != NULL) ssl_ctx_set_excert(ctx2, exc); @@ -2770,7 +2768,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context) err: if (con != NULL) { BIO_printf(bio_s_out, "shutting down SSL\n"); - SSL_set_shutdown(con, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN); + do_ssl_shutdown(con); SSL_free(con); } BIO_printf(bio_s_out, "CONNECTION CLOSED\n"); @@ -3439,7 +3437,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context) } end: /* make sure we re-use sessions */ - SSL_set_shutdown(con, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN); + do_ssl_shutdown(con); err: OPENSSL_free(buf); @@ -3593,7 +3591,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context) } end: /* make sure we re-use sessions */ - SSL_set_shutdown(con, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN); + do_ssl_shutdown(con); err: |