Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openssl: fix build with LibreSSL < 2.9.1 #5757

Closed
wants to merge 1 commit into from

Conversation

@MarcelRaad
Copy link
Member

@MarcelRaad MarcelRaad commented Aug 1, 2020

SSL_CTX_add0_chain_cert and SSL_CTX_clear_chain_certs were
introduced in LibreSSL 2.9.1 [0].

This fixes the build with LibreSSL 2.8.0, as shipped with openSUSE Leap 15.2.

[0] libressl-portable/openbsd@0db809e

`SSL_CTX_add0_chain_cert` and `SSL_CTX_clear_chain_certs` were
introduced in LibreSSL 2.9.1 [0].

[0] libressl-portable/openbsd@0db809e

Closes
#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) /* 1.0.2 or later */
#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* OpenSSL 1.0.2 or later */ \
!(defined(LIBRESSL_VERSION_NUMBER) && \
(LIBRESSL_VERSION_NUMBER < 0x2090100fL)) /* LibreSSL 2.9.1 or later */
Copy link
Member

@bagder bagder Aug 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if its this version or later shouldn't the condition then be: LIBRESSL_VERSION_NUMBER >= 0x2090100fL ?

Loading

Copy link
Member

@bagder bagder Aug 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah no, I didn't really spot the negation in front of that second half... It just surprised me, but there's noting wrong there I think.

Loading

Copy link
Member Author

@MarcelRaad MarcelRaad Aug 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I tried to match the style of the other conditions in this file and had to look at them twice too!

Loading

@MarcelRaad MarcelRaad closed this in c71d8bb Aug 1, 2020
@MarcelRaad MarcelRaad deleted the fix_libressl2.8_build branch Aug 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants