remove conditions that prevent use of custom TLS stream

diff --git a/src/settings.c b/src/settings.c
index 00a3ef04d99c376af4df0351f75b8eb4e58f7a5f..21430bce9e8d3736d0be236cce5763ada810af27 100644 (file)
--- a/src/settings.c
+++ b/src/settings.c
@@ -29,9 +29,7 @@ int git_libgit2_features(void)
 #ifdef GIT_THREADS
                | GIT_FEATURE_THREADS
 #endif
-#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
                | GIT_FEATURE_HTTPS
-#endif
 #if defined(GIT_SSH)
                | GIT_FEATURE_SSH
 #endif

diff --git a/src/transport.c b/src/transport.c
index 327052fa393a959a3e822d591c1de4b9858c85fb..32f8464f611b03b99b6ece0d7fbfc35467a22733 100644 (file)
--- a/src/transport.c
+++ b/src/transport.c
@@ -29,9 +29,7 @@ static transport_definition local_transport_definition = { "file://", git_transp
 static transport_definition transports[] = {
        { "git://",   git_transport_smart, &git_subtransport_definition },
        { "http://",  git_transport_smart, &http_subtransport_definition },
-#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
        { "https://", git_transport_smart, &http_subtransport_definition },
-#endif
        { "file://",  git_transport_local, NULL },
 #ifdef GIT_SSH
        { "ssh://",   git_transport_smart, &ssh_subtransport_definition },

diff --git a/src/transports/http.c b/src/transports/http.c
index 4fbbfbbad225ea7fb0902ec1d1f6e098bc3ebe3a..30520a05df60e642580fb104b5c4b37a460a1081 100644 (file)
--- a/src/transports/http.c
+++ b/src/transports/http.c
@@ -620,7 +620,6 @@ static int http_connect(http_subtransport *t)
 
        error = git_stream_connect(t->io);
 
-#if defined(GIT_OPENSSL) || defined(GIT_SECURE_TRANSPORT) || defined(GIT_CURL)
        if ((!error || error == GIT_ECERTIFICATE) && t->owner->certificate_check_cb != NULL &&
            git_stream_is_encrypted(t->io)) {
                git_cert *cert;
@@ -640,7 +639,7 @@ static int http_connect(http_subtransport *t)
                        return error;
                }
        }
-#endif
+
        if (error < 0)
                return error;
 

diff --git a/tests/core/features.c b/tests/core/features.c
index 85cddfeff7091109ece40fe08bfe365e514bc5e2..cf5e190635595ff06d5e657d13e2bd76f25b9375 100644 (file)
--- a/tests/core/features.c
+++ b/tests/core/features.c
@@ -17,11 +17,7 @@ void test_core_features__0(void)
        cl_assert((caps & GIT_FEATURE_THREADS) == 0);
 #endif
 
-#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
        cl_assert((caps & GIT_FEATURE_HTTPS) != 0);
-#else
-       cl_assert((caps & GIT_FEATURE_HTTPS) == 0);
-#endif
 
 #if defined(GIT_SSH)
        cl_assert((caps & GIT_FEATURE_SSH) != 0);