forked from osmocom/wireshark
Throw some casts at compiler warnings.
Change-Id: I609fcba0b015599f98edb1b3927edb5684bcf2b1 Reviewed-on: https://code.wireshark.org/review/5887 Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
parent
d4ff430b4d
commit
f4ffbbba27
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue