diff options
author | Stephen Fisher <stephenfisher@centurylink.net> | 2014-11-04 10:11:40 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-11-04 18:52:52 +0000 |
commit | 608688537a177e6a35f87360e0da8fd8110efc65 (patch) | |
tree | c9b439a77369347a4b184ca63a2ebb287ad74e53 /epan/dissectors/packet-kerberos.c | |
parent | 9ac261f205b7b6cba646368433eac550c7a6acd7 (diff) |
Fix some compilation errors (size_t to guint/gint) and an unused parameter
Change-Id: I2d64d840c93f951dd5481ca5950ff5587da6843d
Reviewed-on: https://code.wireshark.org/review/5112
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-kerberos.c')
-rw-r--r-- | epan/dissectors/packet-kerberos.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index d1bebb9ad3..d49d9ec5a2 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -729,8 +729,8 @@ read_keytab_file(const char *filename) g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "@%s",key.principal->realm)); *pos=0; new_key->keytype=key.keyblock.keytype; - new_key->keylength=key.keyblock.keyvalue.length; - new_key->keyvalue=g_memdup(key.keyblock.keyvalue.data, key.keyblock.keyvalue.length); + new_key->keylength=(int)key.keyblock.keyvalue.length; + new_key->keyvalue=g_memdup(key.keyblock.keyvalue.data, (guint)key.keyblock.keyvalue.length); enc_key_list=new_key; } }while(ret==0); @@ -745,7 +745,7 @@ USES_APPLE_RST guint8 * -decrypt_krb5_data(proto_tree *tree, packet_info *pinfo, +decrypt_krb5_data(proto_tree *tree _U_, packet_info *pinfo, int usage, tvbuff_t *cryptotvb, int keytype, @@ -808,9 +808,9 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo, krb5_crypto_destroy(krb5_ctx, crypto); /* return a private g_malloced blob to the caller */ - user_data=g_memdup(data.data, data.length); + user_data=g_memdup(data.data, (guint)data.length); if (datalen) { - *datalen = data.length; + *datalen = (int)data.length; } return user_data; } |