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

fix build with libressl #4251

Closed
wants to merge 1 commit into from
Closed

fix build with libressl #4251

wants to merge 1 commit into from

Conversation

Keruspe
Copy link
Contributor

@Keruspe Keruspe commented Jun 5, 2017

No description provided.

@pks-t
Copy link
Member

pks-t commented Jun 6, 2017

The change looks good to me, thank you. I'd welcome an improved commit message, though. E.g. something along the lines of:

openssl_stream: fix building with libressl

OpenSSL v1.1 has introduced a new way of initializing the library without having to call various functions of different subsystems. In libgit2, we have been adapting to that change with 88520151f (openssl_stream: use new initialization function on OpenSSL version >=1.1, 2017-04-07), where we added an #ifdef depending on the OpenSSL version. This change broke building with libressl, though, which has not changed its API in the same way.

Fix the issue by expanding the #ifdef condition to use the old way of initializing with libressl.

I didn't include any line breaks as it would be tedious to do so inside of the GitHub code editor :P

OpenSSL v1.1 has introduced a new way of initializing the library
without having to call various functions of different subsystems. In
libgit2, we have been adapting to that change with 8852015
(openssl_stream: use new initialization function on OpenSSL version
>=1.1, 2017-04-07), where we added an #ifdef depending on the OpenSSL
version. This change broke building with libressl, though, which has not
changed its API in the same way.

Fix the issue by expanding the #ifdef condition to use the old way of
initializing with libressl.

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@Keruspe
Copy link
Contributor Author

Keruspe commented Jun 6, 2017

Sure, edited the message

pks-t added a commit that referenced this pull request Jun 7, 2017
@pks-t
Copy link
Member

pks-t commented Jun 7, 2017

I've manually merged your commit via 40139fe to also include the 'openssl_stream:' prefix in the commit message. Thanks again for this fix!

@pks-t pks-t closed this Jun 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants