Mercurial > hg > nginx
changeset 7963:9b9299494238 stable-1.20
SSL: ERR_peek_error_line_data() compatibility with OpenSSL 3.0.
ERR_peek_error_line_data() was deprecated in favour of ERR_peek_error_all().
Here we use the ERR_peek_error_data() helper to pass only used arguments.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Tue, 10 Aug 2021 23:43:16 +0300 |
parents | ddfad46492b5 |
children | 7b79f0944197 |
files | src/event/ngx_event_openssl.c src/event/ngx_event_openssl.h |
diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event_openssl.c Tue Aug 10 23:43:16 2021 +0300 +++ b/src/event/ngx_event_openssl.c Tue Aug 10 23:43:16 2021 +0300 @@ -3280,7 +3280,7 @@ for ( ;; ) { - n = ERR_peek_error_line_data(NULL, NULL, &data, &flags); + n = ERR_peek_error_data(&data, &flags); if (n == 0) { break;
--- a/src/event/ngx_event_openssl.h Tue Aug 10 23:43:16 2021 +0300 +++ b/src/event/ngx_event_openssl.h Tue Aug 10 23:43:16 2021 +0300 @@ -69,6 +69,11 @@ #endif +#if (OPENSSL_VERSION_NUMBER < 0x30000000L && !defined ERR_peek_error_data) +#define ERR_peek_error_data(d, f) ERR_peek_error_line_data(NULL, NULL, d, f) +#endif + + typedef struct ngx_ssl_ocsp_s ngx_ssl_ocsp_t;