On Fri, Jun 26, 2020 at 01:25:42PM +0500, Илья Шипицин wrote: > пт, 26 июн. 2020 г. в 13:18, William Lallemand <wlallem...@haproxy.com>: > > > Hello, > > > > On Sat, Jun 20, 2020 at 11:42:57PM +0500, Илья Шипицин wrote: > > > include/haproxy/openssl-compat.h | 7 +++---- > > > 1 file changed, 3 insertions(+), 4 deletions(-) > > > > > > diff --git a/include/haproxy/openssl-compat.h > > b/include/haproxy/openssl-compat.h > > > index 34fe6cb76..acdc9c5bc 100644 > > > --- a/include/haproxy/openssl-compat.h > > > +++ b/include/haproxy/openssl-compat.h > > > @@ -81,6 +81,9 @@ static inline void X509_ALGOR_get0(ASN1_OBJECT > > **paobj, int *pptype, const void > > > > > > #endif // OpenSSL < 0.9.8 > > > > > > +#if (((HA_OPENSSL_VERSION_NUMBER < 0x1000000fL) || > > defined(OPENSSL_IS_BORINGSSL)) && !defined(X509_get_X509_PUBKEY)) > > > +#define X509_get_X509_PUBKEY(x) ((x)->cert_info->key) > > > +#endif > > > > > > > I'm suprised that you had to a version check there, doesn't this work > > with only !defined(X509_get_X509_PUBKEY) ? > > > > for some openssl versions it is a function, not possible to check using > ifdef > >
Okay, thanks, I'm merging it. -- William Lallemand
