diff options
-rw-r--r-- | lib/curl_ntlm_msgs.c | 23 | ||||
-rw-r--r-- | lib/endian.c | 22 | ||||
-rw-r--r-- | lib/endian.h | 3 |
3 files changed, 26 insertions, 22 deletions
diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c index ece1d0fa4..3d6cf53e0 100644 --- a/lib/curl_ntlm_msgs.c +++ b/lib/curl_ntlm_msgs.c @@ -52,6 +52,7 @@ #define BUILDING_CURL_NTLM_MSGS_C #include "curl_ntlm_msgs.h" #include "curl_sasl.h" +#include "endian.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -149,28 +150,6 @@ static void ntlm_print_hex(FILE *handle, const char *buf, size_t len) #endif /* - * This function converts from the little endian format used in the - * incoming package to whatever endian format we're using natively. - * Argument is a pointer to a 4 byte buffer. - */ -static unsigned int readint_le(unsigned char *buf) -{ - return ((unsigned int)buf[0]) | ((unsigned int)buf[1] << 8) | - ((unsigned int)buf[2] << 16) | ((unsigned int)buf[3] << 24); -} - -/* - * This function converts from the little endian format used in the incoming - * package to whatever endian format we're using natively. Argument is a - * pointer to a 2 byte buffer. - */ -static unsigned short readshort_le(unsigned char *buf) -{ - return (unsigned short)(((unsigned short)buf[0]) | - ((unsigned short)buf[1] << 8)); -} - -/* * ntlm_decode_type2_target() * * This is used to decode the "target info" in the ntlm type-2 message diff --git a/lib/endian.c b/lib/endian.c index cc97adf5a..f95012905 100644 --- a/lib/endian.c +++ b/lib/endian.c @@ -23,3 +23,25 @@ #include "curl_setup.h" #include "endian.h" + +/* + * This function converts from the little endian format used in the incoming + * package to whatever endian format we're using natively. Argument is a + * pointer to a 2 byte buffer. + */ +unsigned short readshort_le(unsigned char *buf) +{ + return (unsigned short)(((unsigned short)buf[0]) | + ((unsigned short)buf[1] << 8)); +} + +/* + * This function converts from the little endian format used in the + * incoming package to whatever endian format we're using natively. + * Argument is a pointer to a 4 byte buffer. + */ +unsigned int readint_le(unsigned char *buf) +{ + return ((unsigned int)buf[0]) | ((unsigned int)buf[1] << 8) | + ((unsigned int)buf[2] << 16) | ((unsigned int)buf[3] << 24); +} diff --git a/lib/endian.h b/lib/endian.h index fd175745a..994b5dbd9 100644 --- a/lib/endian.h +++ b/lib/endian.h @@ -22,4 +22,7 @@ * ***************************************************************************/ +unsigned short readshort_le(unsigned char *buf); +unsigned int readint_le(unsigned char *buf); + #endif /* HEADER_CURL_ENDIAN_H */ |