diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-04-29 15:23:10 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-04-29 15:23:10 +0000 |
| commit | 69d050d9c49703be947dad499bfe9031b592751a (patch) | |
| tree | caeefdcb6af0ea8d5da1e33cb9b2f5092edf4169 /epan | |
| parent | 3cb4487d500ebf8ead38b4e86316e99798ff2bcd (diff) | |
Make a variable a guint8* instead of a char* since it a) holds TVB data and b) matches what tvb_new_child_real_data() wants for its 2nd argument. This cleans up a warning from the Sun compiler.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32599 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-isakmp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-spnego.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 91c5cdad90..54dbf109bf 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -1700,7 +1700,7 @@ scan_pluto_log(void) { static tvbuff_t * decrypt_payload(tvbuff_t *tvb, packet_info *pinfo, const guint8 *buf, guint buf_len, isakmp_hdr_t *hdr) { decrypt_data_t *decr = (decrypt_data_t *) pinfo->private_data; - gchar *decrypted_data = NULL; + guint8 *decrypted_data = NULL; gint gcry_md_algo, gcry_cipher_algo; gcry_md_hd_t md_ctx; gcry_cipher_hd_t decr_ctx; diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index fd0a48bca5..8b7d2b2af9 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1131,7 +1131,7 @@ decrypt_gssapi_krb_arcfour_wrap(proto_tree *tree, packet_info *pinfo, tvbuff_t * ); if (ret >= 0) { proto_tree_add_text(tree, NULL, 0, 0, "[Decrypted using: %s]", ek->key_origin); - pinfo->gssapi_decrypted_tvb=tvb_new_child_real_data(tvb, + pinfo->gssapi_decrypted_tvb=tvb_new_child_real_data(tvb, output_message_buffer, ret, ret); tvb_set_free_cb(pinfo->gssapi_decrypted_tvb, g_free); @@ -1201,8 +1201,8 @@ decrypt_gssapi_krb_cfx_wrap(proto_tree *tree _U_, unsigned int usage) { int res; - char *rotated; - char *output; + guint8 *rotated; + guint8 *output; int datalen; tvbuff_t *next_tvb; @@ -1235,7 +1235,7 @@ decrypt_gssapi_krb_cfx_wrap(proto_tree *tree _U_, keytype, &datalen); if (output) { - char *outdata; + guint8 *outdata; outdata = g_memdup(output, tvb_length(encrypted_tvb)); g_free(output); |