IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-25 00:20:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

SSL: ERR_peek_error_line_data() compatibility with OpenSSL 3.0.

Browse Source 
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.
This commit is contained in:
Sergey Kandaurov 2021-08-10 23:43:16 +03:00
parent b26858aa3c
commit 9609288e7c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/event/ngx_event_openssl.c
View File

@ -3280,7 +3280,7 @@ ngx_ssl_error(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, char *fmt, ...)
for ( ;; ) { for ( ;; ) {
n = ERR_peek_error_line_data(NULL, NULL, &data, &flags); n = ERR_peek_error_data(&data, &flags);
if (n == 0) { if (n == 0) {
break; break;

5
src/event/ngx_event_openssl.h
View File

@ -69,6 +69,11 @@
#endif #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; typedef struct ngx_ssl_ocsp_s ngx_ssl_ocsp_t;