[nginx] SSL: fixed build with OPENSSL_NO_DH.

noreply at nginx.com noreply at nginx.com
Fri Apr 25 10:57:02 UTC 2025


details:   https://github.com/nginx/nginx/commit/adda7041582d8565ee1e5e7dfe740db85398e1ce
branches:  master
commit:    adda7041582d8565ee1e5e7dfe740db85398e1ce
user:      Sergey Kandaurov <pluknet at nginx.com>
date:      Wed, 16 Apr 2025 20:58:57 +0400
description:
SSL: fixed build with OPENSSL_NO_DH.


---
 src/event/ngx_event_openssl.c | 4 ++++
 src/event/ngx_event_openssl.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 6992cc4a4..7eb05209d 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1315,6 +1315,8 @@ ngx_ssl_passwords_cleanup(void *data)
 ngx_int_t
 ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
 {
+#ifndef OPENSSL_NO_DH
+
     BIO  *bio;
 
     if (file->len == 0) {
@@ -1385,6 +1387,8 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
 
     BIO_free(bio);
 
+#endif
+
     return NGX_OK;
 }
 
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index 9ba21a810..d4a62b82a 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -19,7 +19,9 @@
 #include <openssl/bn.h>
 #include <openssl/conf.h>
 #include <openssl/crypto.h>
+#ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
+#endif
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif


More information about the nginx-devel mailing list