aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-11-06 12:31:10 +0000
committerSteve Holme <steve_holme@hotmail.com>2014-11-06 12:37:59 +0000
commit93859e2c9a0a4c0a9fe20bccdb20e376474a17ca (patch)
treea17ef037c1ebef5b4b7689b450a2b0ce57c57401
parent2d2a62e3d9b1b092412c5d28fad66d7e7c11fb32 (diff)
sasl: Removed non-SSPI Digest functions and defines from SSPI based builds
Introduced in commit 7e6d51a73c these functions and definitions are only required by the internal challenge-response functions now.
-rw-r--r--lib/curl_sasl.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 70e5db3ef..59bafc7c3 100644
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -59,13 +59,10 @@
extern void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5);
#endif
-#if !defined(CURL_DISABLE_CRYPTO_AUTH)
-
-#if !defined(USE_WINDOWS_SSPI)
+#if !defined(CURL_DISABLE_CRYPTO_AUTH) && !defined(USE_WINDOWS_SSPI)
#define DIGEST_QOP_VALUE_AUTH (1 << 0)
#define DIGEST_QOP_VALUE_AUTH_INT (1 << 1)
#define DIGEST_QOP_VALUE_AUTH_CONF (1 << 2)
-#endif /* !USE_WINDOWS_SSPI */
#define DIGEST_QOP_VALUE_STRING_AUTH "auth"
#define DIGEST_QOP_VALUE_STRING_AUTH_INT "auth-int"
@@ -194,7 +191,6 @@ static char *sasl_digest_string_quoted(const char *source)
return dest;
}
-#if !defined(USE_WINDOWS_SSPI)
/* Retrieves the value for a corresponding key from the challenge string
* returns TRUE if the key could be found, FALSE if it does not exists
*/
@@ -251,9 +247,7 @@ static CURLcode sasl_digest_get_qop_values(const char *options, int *value)
return CURLE_OK;
}
-#endif /* !USE_WINDOWS_SSPI */
-
-#endif /* !CURL_DISABLE_CRYPTO_AUTH */
+#endif /* !CURL_DISABLE_CRYPTO_AUTH && !USE_WINDOWS_SSPI */
#if !defined(USE_WINDOWS_SSPI)
/*