From: Sergey Kandaurov <pluknet@nginx.com>
Date: Wed, 30 Jul 2025 12:09:21 +0000 (+0400)
Subject: QUIC: localized OpenSSL headers used for QUIC protection.
X-Git-Tag: release-1.29.2~8
X-Git-Url: http://www.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=4c9ae11dff0da5ae76c0e4b6571ce30f7f8024bc;p=nginx.git

QUIC: localized OpenSSL headers used for QUIC protection.
---

diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index 9943ee430..3e5483791 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -26,14 +26,6 @@
 #include <openssl/engine.h>
 #endif
 #include <openssl/evp.h>
-#if (NGX_QUIC)
-#ifdef OPENSSL_IS_BORINGSSL
-#include <openssl/hkdf.h>
-#include <openssl/chacha.h>
-#else
-#include <openssl/kdf.h>
-#endif
-#endif
 #include <openssl/hmac.h>
 #ifndef OPENSSL_NO_OCSP
 #include <openssl/ocsp.h>
diff --git a/src/event/quic/ngx_event_quic_protection.c b/src/event/quic/ngx_event_quic_protection.c
index 885843d72..c94d6ea31 100644
--- a/src/event/quic/ngx_event_quic_protection.c
+++ b/src/event/quic/ngx_event_quic_protection.c
@@ -8,6 +8,12 @@
 #include <ngx_core.h>
 #include <ngx_event.h>
 #include <ngx_event_quic_connection.h>
+#ifdef OPENSSL_IS_BORINGSSL
+#include <openssl/hkdf.h>
+#include <openssl/chacha.h>
+#else
+#include <openssl/kdf.h>
+#endif
 
 
 /* RFC 9001, 5.4.1.  Header Protection Application: 5-byte mask */