Mercurial > hg > nginx
comparison src/event/ngx_event_openssl.c @ 6767:e0d1c1e05eef stable-1.10
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.
| author | Sergey Kandaurov <pluknet@nginx.com> |
|---|---|
| date | Mon, 22 Aug 2016 18:53:21 +0300 |
| parents | 12c65ff24fd3 |
| children | 131bc715ce87 |
comparison
equal
deleted
inserted
replaced
| 6766:12c65ff24fd3 | 6767:e0d1c1e05eef |
|---|---|
| 2898 EVP_EncryptInit_ex(ectx, EVP_aes_128_cbc(), NULL, key[0].aes_key, iv); | 2898 EVP_EncryptInit_ex(ectx, EVP_aes_128_cbc(), NULL, key[0].aes_key, iv); |
| 2899 HMAC_Init_ex(hctx, key[0].hmac_key, 16, | 2899 HMAC_Init_ex(hctx, key[0].hmac_key, 16, |
| 2900 ngx_ssl_session_ticket_md(), NULL); | 2900 ngx_ssl_session_ticket_md(), NULL); |
| 2901 ngx_memcpy(name, key[0].name, 16); | 2901 ngx_memcpy(name, key[0].name, 16); |
| 2902 | 2902 |
| 2903 return 0; | 2903 return 1; |
| 2904 | 2904 |
| 2905 } else { | 2905 } else { |
| 2906 /* decrypt session ticket */ | 2906 /* decrypt session ticket */ |
| 2907 | 2907 |
| 2908 for (i = 0; i < keys->nelts; i++) { | 2908 for (i = 0; i < keys->nelts; i++) { |