mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
http_ntlm: Use the SASL functions instead
In preparation for moving the NTLM message code into the SASL module use the SASL functions in the HTTP code instead.
This commit is contained in:
parent
9dbbba9976
commit
48d19acb7c
@ -85,7 +85,7 @@ CURLcode Curl_input_ntlm(struct connectdata *conn,
|
|||||||
header++;
|
header++;
|
||||||
|
|
||||||
if(*header) {
|
if(*header) {
|
||||||
result = Curl_ntlm_decode_type2_message(conn->data, header, ntlm);
|
result = Curl_sasl_decode_ntlm_type2_message(conn->data, header, ntlm);
|
||||||
if(result)
|
if(result)
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
@ -175,8 +175,8 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy)
|
|||||||
case NTLMSTATE_TYPE1:
|
case NTLMSTATE_TYPE1:
|
||||||
default: /* for the weird cases we (re)start here */
|
default: /* for the weird cases we (re)start here */
|
||||||
/* Create a type-1 message */
|
/* Create a type-1 message */
|
||||||
result = Curl_ntlm_create_type1_message(userp, passwdp, ntlm, &base64,
|
result = Curl_sasl_create_ntlm_type1_message(userp, passwdp, ntlm, &base64,
|
||||||
&len);
|
&len);
|
||||||
if(result)
|
if(result)
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
@ -195,8 +195,8 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy)
|
|||||||
|
|
||||||
case NTLMSTATE_TYPE2:
|
case NTLMSTATE_TYPE2:
|
||||||
/* We already received the type-2 message, create a type-3 message */
|
/* We already received the type-2 message, create a type-3 message */
|
||||||
result = Curl_ntlm_create_type3_message(conn->data, userp, passwdp,
|
result = Curl_sasl_create_ntlm_type3_message(conn->data, userp, passwdp,
|
||||||
ntlm, &base64, &len);
|
ntlm, &base64, &len);
|
||||||
if(result)
|
if(result)
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user