diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index 6e8fbc0f0d..ae52a093ac 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -494,7 +494,7 @@ read_keytab_file(const char *filename) } do{ - new_key=g_malloc(sizeof(enc_key_t)); + new_key = (enc_key_t *)g_malloc(sizeof(enc_key_t)); new_key->fd_num = -1; new_key->next=enc_key_list; ret = krb5_kt_next_entry(krb5_ctx, keytab, &key, &cursor); @@ -515,7 +515,7 @@ read_keytab_file(const char *filename) *pos=0; new_key->keytype=key.keyblock.keytype; new_key->keylength=(int)key.keyblock.keyvalue.length; - new_key->keyvalue=g_memdup(key.keyblock.keyvalue.data, (guint)key.keyblock.keyvalue.length); + new_key->keyvalue = (guint8 *)g_memdup(key.keyblock.keyvalue.data, (guint)key.keyblock.keyvalue.length); enc_key_list=new_key; } }while(ret==0); @@ -567,7 +567,7 @@ decrypt_krb5_data(proto_tree *tree _U_, packet_info *pinfo, key.keyblock.keytype=ek->keytype; key.keyblock.keyvalue.length=ek->keylength; key.keyblock.keyvalue.data=ek->keyvalue; - ret = krb5_crypto_init(krb5_ctx, &(key.keyblock), 0, &crypto); + ret = krb5_crypto_init(krb5_ctx, &(key.keyblock), (krb5_enctype)0, &crypto); if(ret){ return NULL; } @@ -578,7 +578,7 @@ decrypt_krb5_data(proto_tree *tree _U_, packet_info *pinfo, keys. So just give it a copy of the crypto data instead. This has been seen for RC4-HMAC blobs. */ - cryptocopy=g_memdup(cryptotext, length); + cryptocopy = (guint8 *)g_memdup(cryptotext, length); ret = krb5_decrypt_ivec(krb5_ctx, crypto, usage, cryptocopy, length, &data, @@ -593,7 +593,7 @@ decrypt_krb5_data(proto_tree *tree _U_, packet_info *pinfo, krb5_crypto_destroy(krb5_ctx, crypto); /* return a private g_malloced blob to the caller */ - user_data=g_memdup(data.data, (guint)data.length); + user_data = (char *)g_memdup(data.data, (guint)data.length); if (datalen) { *datalen = (int)data.length; } diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index feb0ae7519..9d4511c5fd 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -745,7 +745,7 @@ read_keytab_file(const char *filename) } do{ - new_key=g_malloc(sizeof(enc_key_t)); + new_key = (enc_key_t *)g_malloc(sizeof(enc_key_t)); new_key->fd_num = -1; new_key->next=enc_key_list; ret = krb5_kt_next_entry(krb5_ctx, keytab, &key, &cursor); @@ -766,7 +766,7 @@ read_keytab_file(const char *filename) *pos=0; new_key->keytype=key.keyblock.keytype; new_key->keylength=(int)key.keyblock.keyvalue.length; - new_key->keyvalue=g_memdup(key.keyblock.keyvalue.data, (guint)key.keyblock.keyvalue.length); + new_key->keyvalue = (guint8 *)g_memdup(key.keyblock.keyvalue.data, (guint)key.keyblock.keyvalue.length); enc_key_list=new_key; } }while(ret==0); @@ -818,7 +818,7 @@ decrypt_krb5_data(proto_tree *tree _U_, packet_info *pinfo, key.keyblock.keytype=ek->keytype; key.keyblock.keyvalue.length=ek->keylength; key.keyblock.keyvalue.data=ek->keyvalue; - ret = krb5_crypto_init(krb5_ctx, &(key.keyblock), 0, &crypto); + ret = krb5_crypto_init(krb5_ctx, &(key.keyblock), (krb5_enctype)0, &crypto); if(ret){ return NULL; } @@ -829,7 +829,7 @@ decrypt_krb5_data(proto_tree *tree _U_, packet_info *pinfo, keys. So just give it a copy of the crypto data instead. This has been seen for RC4-HMAC blobs. */ - cryptocopy=g_memdup(cryptotext, length); + cryptocopy = (guint8 *)g_memdup(cryptotext, length); ret = krb5_decrypt_ivec(krb5_ctx, crypto, usage, cryptocopy, length, &data, @@ -844,7 +844,7 @@ decrypt_krb5_data(proto_tree *tree _U_, packet_info *pinfo, krb5_crypto_destroy(krb5_ctx, crypto); /* return a private g_malloced blob to the caller */ - user_data=g_memdup(data.data, (guint)data.length); + user_data = (char *)g_memdup(data.data, (guint)data.length); if (datalen) { *datalen = (int)data.length; }