mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 12:41:00 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: ssl: Build local DH of right size when needed

Browse Source 
The current way the local DH structures are built relies on the fact
that the ssl_get_tmp_dh function would only be called as a callback
during a DHE negotiation, so after all the SSL contexts are built and
the init is over. With OpenSSLv3, this function will now be called
during init, so before those objects are curretly built.
This patch ensures that when calling ssl_get_tmp_dh and trying to use
one of or hard-coded DH parameters, it will be created if it did not
exist yet.
The current DH parameter creation is also kept so that with versions
before OpenSSLv3 we don't end up creating this DH object during a
handshake.
This commit is contained in:
Remi Tricot-Le Breton 2022-02-11 12:04:53 +01:00 committed by William Lallemand
parent 7f6425a130
commit bed72631f9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ssl_sock.c
View File

@ -3110,12 +3110,18 @@ static DH *ssl_get_tmp_dh(EVP_PKEY *pkey)
}
if (keylen >= 4096) {
if (!local_dh_4096)
local_dh_4096 = ssl_get_dh_4096();
dh = local_dh_4096;
}
else if (keylen >= 2048) {
if (!local_dh_2048)
local_dh_2048 = ssl_get_dh_2048();
dh = local_dh_2048;
}
else {
if (!local_dh_1024)
local_dh_1024 = ssl_get_dh_1024();
dh = local_dh_1024;
}