aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2013-09-05 20:18:13 +0000
committerMartin Kaiser <wireshark@kaiser.cx>2013-09-05 20:18:13 +0000
commit2d1b7d1e32d1d4b0e2829abf2ade8aacbe585cf2 (patch)
treef2038cca3527c73a8f89a4192b92c2d0b898937f
parentf6eb619d87667bba537e8f0882ea504906b1f36f (diff)
add casts to make my compiler (gcc 4.6.3) happy
svn path=/trunk/; revision=51790
-rw-r--r--epan/dissectors/packet-ntlmssp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index 70e8453e46..871156bef3 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -972,7 +972,7 @@ dissect_ntlmssp_blob (tvbuff_t *tvb, packet_info *pinfo,
result->length = blob_length;
if (blob_length < MAX_BLOB_SIZE)
{
- result->contents = wmem_alloc(wmem_file_scope(), blob_length);
+ result->contents = (guint8 *)wmem_alloc(wmem_file_scope(), blob_length);
tvb_memcpy(tvb, result->contents, blob_offset, blob_length);
if (blob_hf == hf_ntlmssp_auth_lmresponse &&
!(tvb_memeql(tvb, blob_offset+8, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", NTLMSSP_KEY_LEN)))
@@ -1534,8 +1534,8 @@ dissect_ntlmssp_challenge (tvbuff_t *tvb, packet_info *pinfo, int offset,
{
conv_ntlmssp_info->rc4_state_initialized = 0;
/* XXX - Make sure there is 24 bytes for the key */
- conv_ntlmssp_info->ntlm_response.contents = wmem_alloc0(wmem_file_scope(), 24);
- conv_ntlmssp_info->lm_response.contents = wmem_alloc0(wmem_file_scope(), 24);
+ conv_ntlmssp_info->ntlm_response.contents = (guint8 *)wmem_alloc0(wmem_file_scope(), 24);
+ conv_ntlmssp_info->lm_response.contents = (guint8 *)wmem_alloc0(wmem_file_scope(), 24);
create_ntlmssp_v1_key(gbl_nt_password, conv_ntlmssp_info->server_challenge, NULL, sspkey, NULL, conv_ntlmssp_info->flags, conv_ntlmssp_info->ntlm_response.contents, conv_ntlmssp_info->lm_response.contents, ntlmssph);
if (memcmp(sspkey, gbl_zeros, NTLMSSP_KEY_LEN) != 0) {