aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@nginx.com>2016-08-22 18:53:21 +0300
committerSergey Kandaurov <pluknet@nginx.com>2016-08-22 18:53:21 +0300
commit218c8d493f9f80a25fe382dbc414a2bcd7d0251b (patch)
tree6804fbd5717d64a21ec1ecb8449ccade125a1eef /src
parentc7c5c43c04756b206286be0dd42f219aa095eb4a (diff)
downloadnginx-218c8d493f9f80a25fe382dbc414a2bcd7d0251b.tar.gz
nginx-218c8d493f9f80a25fe382dbc414a2bcd7d0251b.zip
SSL: adopted session ticket handling for OpenSSL 1.1.0.
Return 1 in the SSL_CTX_set_tlsext_ticket_key_cb() callback function to indicate that a new session ticket is created, as per documentation. Until 1.1.0, OpenSSL didn't make a distinction between non-negative return values. See https://git.openssl.org/?p=openssl.git;a=commitdiff;h=5c753de for details.
Diffstat (limited to 'src')
-rw-r--r--src/event/ngx_event_openssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 07e9085a7..45a8f8d52 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -2986,7 +2986,7 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
ngx_ssl_session_ticket_md(), NULL);
ngx_memcpy(name, key[0].name, 16);
- return 0;
+ return 1;
} else {
/* decrypt session ticket */