moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

http NTLM: change return type of Curl_input_ntlm() to CURLcode 

Remove CURLntlm enum, no longer required.
This commit is contained in:
Yang Tse 2011-08-13 23:58:27 +02:00
parent e209f3f176
commit b4d6db83de
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/http.c
View File

@ -767,9 +767,9 @@ CURLcode Curl_http_input_auth(struct connectdata *conn,
if(authp->picked == CURLAUTH_NTLM || if(authp->picked == CURLAUTH_NTLM ||
authp->picked == CURLAUTH_NTLM_SSO) { authp->picked == CURLAUTH_NTLM_SSO) {
/* NTLM authentication is picked and activated */ /* NTLM authentication is picked and activated */
CURLntlm ntlm = CURLcode ntlm =
Curl_input_ntlm(conn, (bool)(httpcode == 407), start); Curl_input_ntlm(conn, (bool)(httpcode == 407), start);
if(CURLNTLM_BAD != ntlm) { if(CURLE_OK == ntlm) {
data->state.authproblem = FALSE; data->state.authproblem = FALSE;
#ifdef WINBIND_NTLM_AUTH_ENABLED #ifdef WINBIND_NTLM_AUTH_ENABLED
if(authp->picked == CURLAUTH_NTLM_SSO) { if(authp->picked == CURLAUTH_NTLM_SSO) {

21
lib/http_ntlm.c
View File

@ -265,7 +265,7 @@ static unsigned int readint_le(unsigned char *buf)
from the beginning of the NTLM message. from the beginning of the NTLM message.
*/ */
CURLntlm Curl_input_ntlm(struct connectdata *conn, CURLcode Curl_input_ntlm(struct connectdata *conn,
bool proxy, /* if proxy or not */ bool proxy, /* if proxy or not */
const char *header) /* rest of the www-authenticate: const char *header) /* rest of the www-authenticate:
header */ header */
@ -275,10 +275,12 @@ CURLntlm Curl_input_ntlm(struct connectdata *conn,
#ifndef USE_WINDOWS_SSPI #ifndef USE_WINDOWS_SSPI
static const char type2_marker[] = { 0x02, 0x00, 0x00, 0x00 }; static const char type2_marker[] = { 0x02, 0x00, 0x00, 0x00 };
#endif #endif
CURLcode result = CURLE_OK;
#ifdef USE_NSS #ifdef USE_NSS
if(CURLE_OK != Curl_nss_force_init(conn->data)) result = Curl_nss_force_init(conn->data);
return CURLNTLM_BAD; if(result)
return result;
#endif #endif
ntlm = proxy ? &conn->proxyntlm : &conn->ntlm; ntlm = proxy ? &conn->proxyntlm : &conn->ntlm;
@ -314,7 +316,7 @@ CURLntlm Curl_input_ntlm(struct connectdata *conn,
unsigned char *buffer; unsigned char *buffer;
size = Curl_base64_decode(header, &buffer); size = Curl_base64_decode(header, &buffer);
if(!buffer) if(!buffer)
return CURLNTLM_BAD; return CURLE_OUT_OF_MEMORY;
ntlm->state = NTLMSTATE_TYPE2; /* we got a type-2 */ ntlm->state = NTLMSTATE_TYPE2; /* we got a type-2 */
@ -334,7 +336,8 @@ CURLntlm Curl_input_ntlm(struct connectdata *conn,
(memcmp(buffer + 8, type2_marker, sizeof(type2_marker)) != 0)) { (memcmp(buffer + 8, type2_marker, sizeof(type2_marker)) != 0)) {
/* This was not a good enough type-2 message */ /* This was not a good enough type-2 message */
free(buffer); free(buffer);
return CURLNTLM_BAD; infof(conn->data, "NTLM handshake failure (bad type-2 message)\n");
return CURLE_REMOTE_ACCESS_DENIED;
} }
ntlm->flags = readint_le(&buffer[20]); ntlm->flags = readint_le(&buffer[20]);
@ -352,14 +355,16 @@ CURLntlm Curl_input_ntlm(struct connectdata *conn,
free(buffer); free(buffer);
} }
else { else {
if(ntlm->state >= NTLMSTATE_TYPE1) if(ntlm->state >= NTLMSTATE_TYPE1) {
return CURLNTLM_BAD; infof(conn->data, "NTLM handshake failure (internal error)\n");
return CURLE_REMOTE_ACCESS_DENIED;
}
ntlm->state = NTLMSTATE_TYPE1; /* we should sent away a type-1 */ ntlm->state = NTLMSTATE_TYPE1; /* we should sent away a type-1 */
} }
} }
return CURLNTLM_FINE; return result;
} }
#ifndef USE_WINDOWS_SSPI #ifndef USE_WINDOWS_SSPI

11
lib/http_ntlm.h
View File

@ -22,17 +22,8 @@
* *
***************************************************************************/ ***************************************************************************/
typedef enum {
CURLNTLM_NONE, /* not a ntlm */
CURLNTLM_BAD, /* an ntlm, but one we don't like */
CURLNTLM_FIRST, /* the first 401-reply we got with NTLM */
CURLNTLM_FINE, /* an ntlm we act on */
CURLNTLM_LAST /* last entry in this enum, don't use */
} CURLntlm;
/* this is for ntlm header input */ /* this is for ntlm header input */
CURLntlm Curl_input_ntlm(struct connectdata *conn, bool proxy, CURLcode Curl_input_ntlm(struct connectdata *conn, bool proxy,
const char *header); const char *header);
/* this is for creating ntlm header output */ /* this is for creating ntlm header output */