moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

curl_ntlm_core: Fixed use of long long for VC6 and VC7

Browse Source 
Commit 07b66cbfa4 unfortunately broke native NTLM message support in
compilers, such as VC6, VC7 and others, that don't support long long
type declarations. This commit fixes VC6 and VC7 as they support the
__int64 extension, however, we should consider an additional fix for
other compilers that don't support this.
This commit is contained in:
Steve Holme 2014-05-04 18:59:55 +01:00
parent 6ebc0d3bd8
commit 4febbedc5a
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/curl_ntlm_core.c
View File

@ -402,7 +402,11 @@ static void write32_le(const int value, unsigned char *buffer)
buffer[3] = (char)((value & 0xFF000000) >> 24); buffer[3] = (char)((value & 0xFF000000) >> 24);
} }
#if defined(HAVE_LONGLONG)
static void write64_le(const long long value, unsigned char *buffer) static void write64_le(const long long value, unsigned char *buffer)
#else
static void write64_le(const __int64 value, unsigned char *buffer)
#endif
{ {
write32_le((int)value, buffer); write32_le((int)value, buffer);
write32_le((int)(value >> 32), buffer + 4); write32_le((int)(value >> 32), buffer + 4);
@ -550,16 +554,27 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash,
unsigned int len = 0; unsigned int len = 0;
unsigned char *ptr = NULL; unsigned char *ptr = NULL;
unsigned char hmac_output[NTLM_HMAC_MD5_LEN]; unsigned char hmac_output[NTLM_HMAC_MD5_LEN];
#if defined(HAVE_LONGLONG)
long long tw; long long tw;
#else
__int64 tw;
#endif
CURLcode res = CURLE_OK; CURLcode res = CURLE_OK;
/* Calculate the timestamp */ /* Calculate the timestamp */
#if defined(HAVE_LONGLONG)
#if defined(DEBUGBUILD) #if defined(DEBUGBUILD)
tw = 11644473600ULL * 10000000ULL; tw = 11644473600ULL * 10000000ULL;
#else #else
tw = ((long long)time(NULL) + 11644473600ULL) * 10000000ULL; tw = ((long long)time(NULL) + 11644473600ULL) * 10000000ULL;
#endif #endif
#else
#if defined(DEBUGBUILD)
tw = 11644473600ui64 * 10000000ui64;
#else
tw = ((__int64)time(NULL) + 11644473600ui64) * 10000000ui64;
#endif
#endif
/* Calculate the response len */ /* Calculate the response len */
len = NTLM_HMAC_MD5_LEN + NTLMv2_BLOB_LEN; len = NTLM_HMAC_MD5_LEN + NTLMv2_BLOB_LEN;