summaryrefslogtreecommitdiff
path: root/epan/crypt
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2009-03-11 22:44:06 +0000
committerGerald Combs <gerald@wireshark.org>2009-03-11 22:44:06 +0000
commit5f1b7e8f279bccd0a59cc53bec3c8a1a17c86c2e (patch)
treeccbafeb02ca7069490b55195e72d94f8758b674e /epan/crypt
parent4902722ffe66b72d5653d9a3395c6b7f6f92cb4a (diff)
downloadwireshark-5f1b7e8f279bccd0a59cc53bec3c8a1a17c86c2e.tar.gz
More Win64 fixes.
svn path=/trunk/; revision=27707
Diffstat (limited to 'epan/crypt')
-rw-r--r--epan/crypt/airpdcap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c
index 03491e0b31..bf59e1d15b 100644
--- a/epan/crypt/airpdcap.c
+++ b/epan/crypt/airpdcap.c
@@ -1676,7 +1676,7 @@ AirPDcapRsnaPwd2PskStep(
digest[ssidLength+1] = (UCHAR)((count>>16) & 0xff);
digest[ssidLength+2] = (UCHAR)((count>>8) & 0xff);
digest[ssidLength+3] = (UCHAR)(count & 0xff);
- sha1_hmac(ppBytes, ppLength, digest, ssidLength+4, digest1);
+ sha1_hmac(ppBytes, ppLength, digest, (guint32) ssidLength+4, digest1);
/* output = U1 */
memcpy(output, digest1, AIRPDCAP_SHA_DIGEST_LEN);
@@ -1834,7 +1834,7 @@ parse_key_string(gchar* input_string)
dk->type = AIRPDCAP_KEY_TYPE_WPA_PMK;
dk->key = g_string_new(key);
- dk->bits = dk->key->len * 4;
+ dk->bits = (guint) dk->key->len * 4;
dk->ssid = NULL;
g_string_free(key_string, TRUE);