diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 04:54:30 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 04:54:30 +0000 |
| commit | a10b98284c44bcafc86ee440ce936cfe305fe01b (patch) | |
| tree | ff1ad5ac23bc527b2cccdff6e73ba401bd04d5f5 /asn1/spnego | |
| parent | bab72ca73439280d7b83d40495d8a39d46267ddc (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48412
Diffstat (limited to 'asn1/spnego')
| -rw-r--r-- | asn1/spnego/packet-spnego-template.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index da381540d1..357cd9f2f2 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -337,23 +337,23 @@ arcfour_mic_key(void *key_data, size_t key_size, int key_type, memcpy(L40 + 10, T, sizeof(T)); md5_hmac( L40, 14, - key_data, + (guint8 *)key_data, key_size, - k5_data); + k5_data); memset(&k5_data[7], 0xAB, 9); } else { md5_hmac( T, 4, - key_data, + (guint8 *)key_data, key_size, - k5_data); + k5_data); } md5_hmac( - cksum_data, cksum_size, - k5_data, + (guint8 *)cksum_data, cksum_size, + (guint8 *)k5_data, 16, - key6_data); + (guint8 *)key6_data); return 0; } @@ -402,9 +402,9 @@ arcfour_mic_cksum(guint8 *key_data, int key_length, t[2] = (rc4_usage >> 16) & 0xFF; t[3] = (rc4_usage >> 24) & 0xFF; md5_append(&ms, t, 4); - md5_append(&ms, v1, l1); - md5_append(&ms, v2, l2); - md5_append(&ms, v3, l3); + md5_append(&ms, (guint8 *)v1, l1); + md5_append(&ms, (guint8 *)v2, l2); + md5_append(&ms, (guint8 *)v3, l3); md5_finish(&ms, digest); md5_hmac(digest, 16, ksign_c, 16, cksum); |