Add GIT_TLS to signal TLS support

tiennou · tiennou · commit 2cdd5dd372ef · 2017-03-22T22:36:26.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -545,16 +545,20 @@ ELSE()
 ENDIF()
 
 IF (SECURITY_FOUND)
-  ADD_DEFINITIONS(-DGIT_SECURE_TRANSPORT)
-  INCLUDE_DIRECTORIES(${SECURITY_INCLUDE_DIR})
+	ADD_DEFINITIONS(-DGIT_SECURE_TRANSPORT)
+	INCLUDE_DIRECTORIES(${SECURITY_INCLUDE_DIR})
 ENDIF ()
 
 IF (OPENSSL_FOUND)
-  ADD_DEFINITIONS(-DGIT_OPENSSL)
-  INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
-  SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES})
+	ADD_DEFINITIONS(-DGIT_OPENSSL)
+	INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
+	SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES})
 ENDIF()
 
+IF (WINHTTP OR SECURITY_FOUND OR OPENSSL_FOUND)
+	ADD_DEFINITIONS(-DGIT_TLS)
+	SET(HAS_TLS_SUPPORT)
+ENDIF()
 
 
 IF (THREADSAFE)
@@ -702,7 +706,7 @@ IF (BUILD_CLAR)
 	ENDIF ()
 
 	ENABLE_TESTING()
-	IF (WINHTTP OR OPENSSL_FOUND OR SECURITY_FOUND)
+	IF (HAS_TLS_SUPPORT)
 		ADD_TEST(libgit2_clar libgit2_clar -ionline)
 	ELSE ()
 		ADD_TEST(libgit2_clar libgit2_clar -v)
diff --git a/src/settings.c b/src/settings.c
@@ -31,7 +31,7 @@ int git_libgit2_features(void)
 #ifdef GIT_THREADS
 		| GIT_FEATURE_THREADS
 #endif
-#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
+#if defined(GIT_TLS)
 		| GIT_FEATURE_HTTPS
 #endif
 #if defined(GIT_SSH)
diff --git a/tests/core/stream.c b/tests/core/stream.c
@@ -37,8 +37,7 @@ void test_core_stream__register_tls(void)
 	 * or when openssl support is disabled (except on OSX
 	 * with Security framework).
 	 */
-#if defined(GIT_WIN32) || \
-	(!defined(GIT_SECURE_TRANSPORT) && !defined(GIT_OPENSSL))
+#if defined(GIT_WIN32) || !defined(GIT_TLS)
 	cl_git_fail_with(-1, error);
 #else
 	cl_git_pass(error);
diff --git a/tests/online/badssl.c b/tests/online/badssl.c
@@ -4,7 +4,7 @@
 
 static git_repository *g_repo;
 
-#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
+#if defined(GIT_TLS)
 static bool g_has_ssl = true;
 #else
 static bool g_has_ssl = false;
