Merge pull request #4236 from pks-t/pks/index-v4-fixes
Fix path computations for compressed index entries
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca52db7..3fb8ae2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -706,9 +706,9 @@
ENABLE_TESTING()
IF (WINHTTP OR OPENSSL_FOUND OR SECURITY_FOUND)
- ADD_TEST(libgit2_clar libgit2_clar -ionline)
+ ADD_TEST(libgit2_clar libgit2_clar -ionline -xclone::local::git_style_unc_paths -xclone::local::standard_unc_paths_are_written_git_style)
ELSE ()
- ADD_TEST(libgit2_clar libgit2_clar -v)
+ ADD_TEST(libgit2_clar libgit2_clar -v -xclone::local::git_style_unc_paths -xclone::local::standard_unc_paths_are_written_git_style)
ENDIF ()
# Add a test target which runs the cred callback tests, to be
diff --git a/src/openssl_stream.c b/src/openssl_stream.c
index 841dcce..759c501 100644
--- a/src/openssl_stream.c
+++ b/src/openssl_stream.c
@@ -103,7 +103,7 @@
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