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

Fix build with LibreSSL 2.7

Merge pull request #4607 from Sp1l/private/fix-libressl-2.7
Fix build with LibreSSL 2.7
d9007dc8 · Patrick Steinhardt · GitHub · c42261a3 · 7490d449 · d9007dc8
Unverified Commit d9007dc8 authored Apr 03, 2018 by Patrick Steinhardt Committed by GitHub Apr 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/streams/openssl.c
+2 -1

src/streams/openssl.h
+2 -1

No files found.
--- a/src/streams/openssl.c
+++ b/src/streams/openssl.c
@@ -104,7 +104,8 @@ int git_openssl_stream_global_init(void)
 	ssl_opts |= SSL_OP_NO_COMPRESSION;
 #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();
 	OpenSSL_add_ssl_algorithms();
 #else

--- a/src/streams/openssl.h
+++ b/src/streams/openssl.h
@@ -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)
 {