mirror of
https://github.com/curl/curl.git
synced 2026-08-26 22:34:45 +03:00
Dan Fandrich added the --disable-crypto-auth option to configure to allow
libcurl to build without Digest support. (I figure it should also explicitly disable Negotiate and NTLM.)
This commit is contained in:
parent
1b02ad5e8a
commit
94043b1150
5 changed files with 36 additions and 5 deletions
14
lib/http.c
14
lib/http.c
|
|
@ -330,6 +330,7 @@ Curl_http_output_auth(struct connectdata *conn,
|
|||
}
|
||||
data->state.authproxy.done = TRUE;
|
||||
}
|
||||
#ifndef CURL_DISABLE_CRYPTO_AUTH
|
||||
else if(data->state.authproxy.want == CURLAUTH_DIGEST) {
|
||||
auth=(char *)"Digest";
|
||||
result = Curl_output_digest(conn,
|
||||
|
|
@ -339,7 +340,7 @@ Curl_http_output_auth(struct connectdata *conn,
|
|||
if(result)
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif
|
||||
infof(data, "Proxy auth using %s with user '%s'\n",
|
||||
auth, conn->proxyuser?conn->proxyuser:"");
|
||||
}
|
||||
|
|
@ -373,6 +374,7 @@ Curl_http_output_auth(struct connectdata *conn,
|
|||
else
|
||||
#endif
|
||||
{
|
||||
#ifndef CURL_DISABLE_CRYPTO_AUTH
|
||||
if(data->state.authhost.picked == CURLAUTH_DIGEST) {
|
||||
auth=(char *)"Digest";
|
||||
result = Curl_output_digest(conn,
|
||||
|
|
@ -381,8 +383,9 @@ Curl_http_output_auth(struct connectdata *conn,
|
|||
(unsigned char *)path);
|
||||
if(result)
|
||||
return result;
|
||||
}
|
||||
else if(data->state.authhost.picked == CURLAUTH_BASIC) {
|
||||
} else
|
||||
#endif
|
||||
if(data->state.authhost.picked == CURLAUTH_BASIC) {
|
||||
if(conn->bits.user_passwd &&
|
||||
!checkheaders(data, "Authorization:")) {
|
||||
auth=(char *)"Basic";
|
||||
|
|
@ -489,6 +492,7 @@ CURLcode Curl_http_input_auth(struct connectdata *conn,
|
|||
}
|
||||
else
|
||||
#endif
|
||||
#ifndef CURL_DISABLE_CRYPTO_AUTH
|
||||
if(checkprefix("Digest", start)) {
|
||||
CURLdigest dig;
|
||||
*availp |= CURLAUTH_DIGEST;
|
||||
|
|
@ -504,7 +508,9 @@ CURLcode Curl_http_input_auth(struct connectdata *conn,
|
|||
data->state.authproblem = TRUE;
|
||||
}
|
||||
}
|
||||
else if(checkprefix("Basic", start)) {
|
||||
else
|
||||
#endif
|
||||
if(checkprefix("Basic", start)) {
|
||||
*availp |= CURLAUTH_BASIC;
|
||||
authp->avail |= CURLAUTH_BASIC;
|
||||
if(authp->picked == CURLAUTH_BASIC) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue