commit 016fd93c31a918173794606c870dcb52286996ae
author Sergey Kandaurov <pluknet@nginx.com> Tue Aug 10 23:43:16 2021 +0300
committer Sergey Kandaurov <pluknet@nginx.com> Tue Aug 10 23:43:16 2021 +0300
tree 9b4b29d1f51d995a2d08a6c8988570eb20689db1
parent c6d3920dbef5b489b2d62cc3ed976693d3de1a47

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.

src/event/ngx_event_openssl.c

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 10a7647..72dd206 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -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;

src/event/ngx_event_openssl.h

diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index a70b862..a54a86a 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;