1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 16:18:48 -05:00

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.
This commit is contained in:
Steve Holme 2014-11-06 12:31:10 +00:00
parent 2d2a62e3d9
commit 93859e2c9a

View File

@ -59,13 +59,10 @@
extern void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5); extern void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5);
#endif #endif
#if !defined(CURL_DISABLE_CRYPTO_AUTH) #if !defined(CURL_DISABLE_CRYPTO_AUTH) && !defined(USE_WINDOWS_SSPI)
#if !defined(USE_WINDOWS_SSPI)
#define DIGEST_QOP_VALUE_AUTH (1 << 0) #define DIGEST_QOP_VALUE_AUTH (1 << 0)
#define DIGEST_QOP_VALUE_AUTH_INT (1 << 1) #define DIGEST_QOP_VALUE_AUTH_INT (1 << 1)
#define DIGEST_QOP_VALUE_AUTH_CONF (1 << 2) #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 "auth"
#define DIGEST_QOP_VALUE_STRING_AUTH_INT "auth-int" #define DIGEST_QOP_VALUE_STRING_AUTH_INT "auth-int"
@ -194,7 +191,6 @@ static char *sasl_digest_string_quoted(const char *source)
return dest; return dest;
} }
#if !defined(USE_WINDOWS_SSPI)
/* Retrieves the value for a corresponding key from the challenge string /* 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 * 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; return CURLE_OK;
} }
#endif /* !USE_WINDOWS_SSPI */ #endif /* !CURL_DISABLE_CRYPTO_AUTH && !USE_WINDOWS_SSPI */
#endif /* !CURL_DISABLE_CRYPTO_AUTH */
#if !defined(USE_WINDOWS_SSPI) #if !defined(USE_WINDOWS_SSPI)
/* /*