generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntlm: Fixed static'ness of local decode function

Browse Source
This commit is contained in:
Steve Holme
2014-11-23 10:32:49 +00:00
parent 885119bf50
commit 409265a571
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/curl_ntlm_msgs.c
View File

@@ -166,7 +166,7 @@ static unsigned int readshort_le(unsigned char *buf)
} }
/* /*
* Curl_ntlm_decode_type2_target() * ntlm_decode_type2_target()
* *
* This is used to decode the "target info" in the ntlm type-2 message * This is used to decode the "target info" in the ntlm type-2 message
* received. * received.
@@ -180,10 +180,10 @@ static unsigned int readshort_le(unsigned char *buf)
* *
* Returns CURLE_OK on success. * Returns CURLE_OK on success.
*/ */
CURLcode Curl_ntlm_decode_type2_target(struct SessionHandle *data, static CURLcode ntlm_decode_type2_target(struct SessionHandle *data,
unsigned char *buffer, unsigned char *buffer,
size_t size, size_t size,
struct ntlmdata *ntlm) struct ntlmdata *ntlm)
{ {
unsigned int target_info_len = 0; unsigned int target_info_len = 0;
unsigned int target_info_offset = 0; unsigned int target_info_offset = 0;
@@ -303,7 +303,7 @@ CURLcode Curl_ntlm_decode_type2_message(struct SessionHandle *data,
memcpy(ntlm->nonce, &type2[24], 8); memcpy(ntlm->nonce, &type2[24], 8);
if(ntlm->flags & NTLMFLAG_NEGOTIATE_TARGET_INFO) { if(ntlm->flags & NTLMFLAG_NEGOTIATE_TARGET_INFO) {
result = Curl_ntlm_decode_type2_target(data, type2, type2_len, ntlm); result = ntlm_decode_type2_target(data, type2, type2_len, ntlm);
if(result) { if(result) {
free(type2); free(type2);
infof(data, "NTLM handshake failure (bad type-2 message)\n"); infof(data, "NTLM handshake failure (bad type-2 message)\n");

6
lib/curl_ntlm_msgs.h
View File

@@ -46,12 +46,6 @@ CURLcode Curl_ntlm_decode_type2_message(struct SessionHandle *data,
const char* header, const char* header,
struct ntlmdata* ntlm); struct ntlmdata* ntlm);
/* This is to decode target info received in NTLM type-2 message */
CURLcode Curl_ntlm_decode_type2_target(struct SessionHandle *data,
unsigned char* buffer,
size_t size,
struct ntlmdata* ntlm);
/* NTLM buffer fixed size, large enough for long user + host + domain */ /* NTLM buffer fixed size, large enough for long user + host + domain */
#define NTLM_BUFSIZE 1024 #define NTLM_BUFSIZE 1024