From f28744a5a3b11e05d64c4696ad5e9399d0b23b96 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Mon, 5 Jun 2017 10:11:20 +0200 Subject: [PATCH] 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. Signed-off-by: Marc-Antoine Perennou --- src/openssl_stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openssl_stream.c b/src/openssl_stream.c index 841dcce50..759c5015f 100644 --- a/src/openssl_stream.c +++ b/src/openssl_stream.c @@ -103,7 +103,7 @@ int git_openssl_stream_global_init(void) ssl_opts |= SSL_OP_NO_COMPRESSION; #endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) SSL_load_error_strings(); OpenSSL_add_ssl_algorithms(); #else