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

pks-t · web-flow · commit d9007dc85209 · 2018-04-03T11:36:27.000+01:00
Fix build with LibreSSL 2.7
diff --git 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
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ extern int git_openssl__set_cert_location(const char file, const char path);`
`31`	`31`
`32`	`32`
`33`	`33`
`34`		`-# if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)`
	`34`	`+# if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| \`
	`35`	`+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)`
`35`	`36`
`36`	`37`	`GIT_INLINE(BIO_METHOD) BIO_meth_new(int type, const char name)`
`37`	`38`	`{`