Skip to content

G
git2
Unverified Commit d9007dc8 by Patrick Steinhardt Committed by GitHub
Options

Merge pull request #4607 from Sp1l/private/fix-libressl-2.7 

Fix build with LibreSSL 2.7
parents c42261a3 7490d449
Showing with 4 additions and 2 deletions
src/streams/openssl.c
...@@ -104,7 +104,8 @@ int git_openssl_stream_global_init(void) ...@@ -104,7 +104,8 @@ int git_openssl_stream_global_init(void)
ssl_opts |= SSL_OP_NO_COMPRESSION; ssl_opts |= SSL_OP_NO_COMPRESSION;
#endif #endif
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER < 0x10100000L || \
(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
SSL_load_error_strings(); SSL_load_error_strings();
OpenSSL_add_ssl_algorithms(); OpenSSL_add_ssl_algorithms();
#else #else
......
src/streams/openssl.h
...@@ -31,7 +31,8 @@ extern int git_openssl__set_cert_location(const char *file, const char *path); ...@@ -31,7 +31,8 @@ extern int git_openssl__set_cert_location(const char *file, const char *path);
# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) # if OPENSSL_VERSION_NUMBER < 0x10100000L || \
(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment