Fix some LLP64 issues.

svn path=/trunk/; revision=30393

3 files changed, 7 insertions, 7 deletions

diff --git a/epan/crypt/crypt-md4.c b/epan/crypt/crypt-md4.c
index cbc41bd2dd..29f993a1b5 100644
--- a/epan/crypt/crypt-md4.c
+++ b/epan/crypt/crypt-md4.c
@@ -127,11 +127,11 @@ static void copy4(unsigned char *out, guint32 x)
 }
 
 /* produce a md4 message digest from data of length n bytes */
-void crypt_md4(unsigned char *out, const unsigned char *in, int n)
+void crypt_md4(unsigned char *out, const unsigned char *in, size_t n)
 {
 	unsigned char buf[128];
 	guint32 M[16];
-	guint32 b = n * 8;
+	guint32 b = (guint32)(n * 8);
 	int i;
 
 	A = 0x67452301;
diff --git a/epan/crypt/crypt-md4.h b/epan/crypt/crypt-md4.h
index 17b251d1da..2db43750b7 100644
--- a/epan/crypt/crypt-md4.h
+++ b/epan/crypt/crypt-md4.h
@@ -20,4 +20,4 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-void crypt_md4(unsigned char *out, const unsigned char *in, int n);
+void crypt_md4(unsigned char *out, const unsigned char *in, size_t n);
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index 55bd46ea75..53f4206753 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -372,8 +372,8 @@ static int ntlmssp_generate_challenge_response(guint8 *response,
 /* Ultra simple ainsi to unicode converter, will only work for ascii password ...*/
 static void str_to_unicode(const char *nt_password, char *nt_password_unicode)
 {
-  int password_len = 0;
-  int i;
+  size_t password_len = 0;
+  size_t i;
 
   password_len = strlen(nt_password);
   if(nt_password_unicode != NULL)
@@ -493,8 +493,8 @@ create_ntlmssp_v2_key(const char *nt_password _U_, const guint8 *serverchallenge
   guint32 i;
   guint32 j;
   rc4_state_struct rc4state;
-  guint32  user_len;
-  guint32 domain_len;
+  size_t user_len;
+  size_t domain_len;
   md4_pass *pass_list = NULL;
   guint32 nb_pass = 0;
   int found = 0;