From: Remi Tricot-Le Breton <rlebreton@haproxy.com>
Date: Wed, 20 Apr 2022 16:30:17 +0000 (+0200)
Subject: BUILD: ssl: Fix compilation with OpenSSL 1.0.2
X-Git-Tag: v2.6-dev7~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c69be7cd3c7914808e73477704fb86486ea82cb6;p=thirdparty%2Fhaproxy.git

BUILD: ssl: Fix compilation with OpenSSL 1.0.2

The DH parameters used for OpenSSL versions 1.1.1 and earlier where
changed. For OpenSSL 1.0.2 and LibreSSL the newly introduced
ssl_get_dh_by_nid function is not used since we keep the original
parameters.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 145ccb3fbd..a7f232e4ff 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -2954,6 +2954,7 @@ end:
 #endif
 }
 
+#if (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L)
 static inline HASSL_DH *ssl_get_dh_by_nid(int nid)
 {
 #if (HA_OPENSSL_VERSION_NUMBER >= 0x3000000fL)
@@ -2982,12 +2983,11 @@ end:
 #else
 
 	HASSL_DH *dh = NULL;
-#if (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L)
 	dh = DH_new_by_nid(nid);
-#endif
 	return dh;
 #endif
 }
+#endif
 
 
 static HASSL_DH * ssl_get_dh_1024(void)