diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2021-08-10 23:43:16 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2021-08-10 23:43:16 +0300 |
| commit | 9609288e7ce4504188b0c8389bbc2f382eed14f5 (patch) | |
| tree | 9b4b29d1f51d995a2d08a6c8988570eb20689db1 | |
| parent | b26858aa3c4055f9f85d09854ece15ad27c792fb (diff) | |
| download | nginx-9609288e7ce4504188b0c8389bbc2f382eed14f5.tar.gz | |
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.
| -rw-r--r-- | src/event/ngx_event_openssl.c | 2 | ||||
| -rw-r--r-- | src/event/ngx_event_openssl.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index 10a76473e..72dd20649 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -3280,7 +3280,7 @@ ngx_ssl_error(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, char *fmt, ...) for ( ;; ) { - n = ERR_peek_error_line_data(NULL, NULL, &data, &flags); + n = ERR_peek_error_data(&data, &flags); if (n == 0) { break; diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h index a70b86221..a54a86a4e 100644 --- a/src/event/ngx_event_openssl.h +++ b/src/event/ngx_event_openssl.h @@ -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; |