пн, 14 февр. 2022 г. в 14:36, William Lallemand <[email protected]>:
>
> Hello Ilya,
>
> > Subject: [PATCH 1/2] BUILD: SSL: fix guarding when OpenSSL is built with
> > OPENSSL_NO_DH
> >
> > some parts of the code support OPENSSL_NO_DH macro, but other do not.
> > let us add wherever appropriate
>
>
> I can't apply this one, part of the DH code changed during OpenSSLv3
> port, could you check if this is still relevant?
>
I will send new patch
In file included from include/haproxy/ssl_ckch-t.h:38,
from include/haproxy/ssl_ckch.h:26,
from src/ssl_ckch.c:32:
src/ssl_ckch.c: In function ‘ssl_sock_load_pem_into_ckch’:
include/haproxy/openssl-compat.h:98:23: error: implicit declaration of
function ‘DH_free’; did you mean ‘lh_free’?
[-Werror=implicit-function-declaration]
98 | #define HASSL_DH_free DH_free
| ^~~~~~~
src/ssl_ckch.c:609:17: note: in expansion of macro ‘HASSL_DH_free’
609 | HASSL_DH_free(dh);
| ^~~~~~~~~~~~~
src/ssl_ckch.c: In function ‘ssl_sock_copy_cert_key_and_chain’:
include/haproxy/openssl-compat.h:99:25: error: implicit declaration of
function ‘DH_up_ref’; did you mean ‘DSA_up_ref’?
[-Werror=implicit-function-declaration]
99 | #define HASSL_DH_up_ref DH_up_ref
| ^~~~~~~~~
src/ssl_ckch.c:689:17: note: in expansion of macro ‘HASSL_DH_up_ref’
689 | HASSL_DH_up_ref(src->dh);
| ^~~~~~~~~~~~~~~
src/ssl_ckch.c: At top level:
>
> Thanks,
>
> --
> William Lallemand
>