From 409265a571e3b0202db0db9511d9c11463dbc66d Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sun, 23 Nov 2014 10:32:49 +0000 Subject: ntlm: Fixed static'ness of local decode function --- lib/curl_ntlm_msgs.c | 12 ++++++------ lib/curl_ntlm_msgs.h | 6 ------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c index 6bef72856..d0672af36 100644 --- a/lib/curl_ntlm_msgs.c +++ b/lib/curl_ntlm_msgs.c @@ -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 * received. @@ -180,10 +180,10 @@ static unsigned int readshort_le(unsigned char *buf) * * Returns CURLE_OK on success. */ -CURLcode Curl_ntlm_decode_type2_target(struct SessionHandle *data, - unsigned char *buffer, - size_t size, - struct ntlmdata *ntlm) +static CURLcode ntlm_decode_type2_target(struct SessionHandle *data, + unsigned char *buffer, + size_t size, + struct ntlmdata *ntlm) { unsigned int target_info_len = 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); 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) { free(type2); infof(data, "NTLM handshake failure (bad type-2 message)\n"); diff --git a/lib/curl_ntlm_msgs.h b/lib/curl_ntlm_msgs.h index 2c97331b0..c28a3698e 100644 --- a/lib/curl_ntlm_msgs.h +++ b/lib/curl_ntlm_msgs.h @@ -46,12 +46,6 @@ CURLcode Curl_ntlm_decode_type2_message(struct SessionHandle *data, const char* header, 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 */ #define NTLM_BUFSIZE 1024 -- cgit v1.2.3