diff --git a/src/smblib/smblib.c b/src/smblib/smblib.c
index 5795b1709de69d52f1e1304c10f8320de0692c96..d06a3e96d1886030cb1636a1df2877fc11eb22fb 100644
--- a/src/smblib/smblib.c
+++ b/src/smblib/smblib.c
@@ -2540,7 +2540,7 @@ static char* strip_chars(uchar* str, uchar* set)
 /* Allocates and calculates hashes of data (based on flags)					*/
 /* Returns NULL on failure													*/
 hash_t* SMBCALL smb_hash(ulong msgnum, ulong t, unsigned source, unsigned flags
-						 ,const uchar* data, size_t length)
+						 ,const void* data, size_t length)
 {
 	hash_t*	hash;
 
@@ -2565,7 +2565,7 @@ hash_t* SMBCALL smb_hash(ulong msgnum, ulong t, unsigned source, unsigned flags
 /* Supports string hash "pre-processing" (e.g. lowercase, strip whitespace)	*/
 /* Returns NULL on failure													*/
 hash_t* SMBCALL smb_hashstr(ulong msgnum, ulong t, unsigned source, unsigned flags
-							,const uchar* str)
+							,const char* str)
 {
 	uchar*	p=(uchar*)str;
 	hash_t*	hash;
@@ -2645,7 +2645,7 @@ int SMBCALL smb_hashmsg(smb_t* smb, smbmsg_t* msg, const uchar* text, BOOL updat
 
 /* length=0 specifies ASCIIZ data											*/
 int SMBCALL smb_getmsgidx_by_hash(smb_t* smb, smbmsg_t* msg, unsigned source
-								 ,unsigned flags, const uchar* data, size_t length)
+								 ,unsigned flags, const void* data, size_t length)
 {
 	int			retval;
 	size_t		n;
@@ -2680,7 +2680,7 @@ int SMBCALL smb_getmsgidx_by_hash(smb_t* smb, smbmsg_t* msg, unsigned source
 }
 
 int SMBCALL smb_getmsghdr_by_hash(smb_t* smb, smbmsg_t* msg, unsigned source
-								 ,unsigned flags, const uchar* data, size_t length)
+								 ,unsigned flags, const void* data, size_t length)
 {
 	int retval;
 
diff --git a/src/smblib/smblib.h b/src/smblib/smblib.h
index 7f09f9fda565ad42e61130c2b4dc9f82d29f615a..17a4ef73241c53413ffe79a1bbc1da8920577a4c 100644
--- a/src/smblib/smblib.h
+++ b/src/smblib/smblib.h
@@ -166,17 +166,17 @@ SMBEXPORT int		SMBCALL smb_updatethread(smb_t* smb, smbmsg_t* remsg, ulong newms
 SMBEXPORT int		SMBCALL smb_findhash(smb_t* smb, hash_t** compare_list, hash_t* found, BOOL mark);
 SMBEXPORT int		SMBCALL smb_hashmsg(smb_t* smb, smbmsg_t* msg, const uchar* text, BOOL update);
 SMBEXPORT hash_t*	SMBCALL	smb_hash(ulong msgnum, ulong time, unsigned source
-								,unsigned flags, const uchar* data, size_t length);
+								,unsigned flags, const void* data, size_t length);
 SMBEXPORT hash_t*	SMBCALL	smb_hashstr(ulong msgnum, ulong time, unsigned source
-								,unsigned flags, const uchar* str);
+								,unsigned flags, const char* str);
 SMBEXPORT hash_t**	SMBCALL smb_msghashes(smb_t* smb, smbmsg_t* msg, const uchar* text);
 SMBEXPORT int		SMBCALL smb_addhashes(smb_t* smb, hash_t** hash_list);
 
 /* Fast look-up functions (using hashes) */
 SMBEXPORT int 		SMBCALL smb_getmsgidx_by_hash(smb_t* smb, smbmsg_t* msg, unsigned source
-								 ,unsigned flags, const uchar* data, size_t length);
+								 ,unsigned flags, const void* data, size_t length);
 SMBEXPORT int 		SMBCALL smb_getmsghdr_by_hash(smb_t* smb, smbmsg_t* msg, unsigned source
-								 ,unsigned flags, const uchar* data, size_t length);
+								 ,unsigned flags, const void* data, size_t length);
 
 /* 0-length specifies ASCIIZ data (length calculated automatically) */
 #define smb_getmsgidx_by_hashstr(smb, msg, source, flags, data) \