upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-05-28 04:12:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

BUILD: ssl: Fix compilation with OpenSSL 1.0.2

Browse source 
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.
This commit is contained in:
Remi Tricot-Le Breton 2022-04-20 18:30:17 +02:00 committed by William Lallemand
parent 1d6338ea96
commit c69be7cd3c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ssl_sock.c
View file

@ -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)