diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-05 18:59:47 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-05 18:59:47 +0000 |
| commit | 11fc9bbe3335e2a0111b81fb874977ea69492b01 (patch) | |
| tree | 3a60617ff47c5fc118dbfe370b9c512c5c2968ee /epan/dissectors/packet-spnego.c | |
| parent | 3e5c04221ab9db0737ec04e18611e041cd1c7250 (diff) | |
Use some tvb_ accessor functions instead of a standard function plus tvb_get_ptr().
svn path=/trunk/; revision=35384
Diffstat (limited to 'epan/dissectors/packet-spnego.c')
| -rw-r--r-- | epan/dissectors/packet-spnego.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 29e63bee03..366f7656bf 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -971,7 +971,7 @@ decrypt_arcfour(packet_info *pinfo, rc4_state_struct rc4_state; crypt_rc4_init(&rc4_state, k6_data, sizeof(k6_data)); - memcpy(SND_SEQ, (unsigned char *)tvb_get_ptr(pinfo->gssapi_wrap_tvb, 8, 8), 8); + tvb_memcpy(pinfo->gssapi_wrap_tvb, SND_SEQ, 8, 8); crypt_rc4(&rc4_state, (unsigned char *)SND_SEQ, 8); memset(k6_data, 0, sizeof(k6_data)); @@ -1001,14 +1001,12 @@ decrypt_arcfour(packet_info *pinfo, rc4_state_struct rc4_state; crypt_rc4_init(&rc4_state, k6_data, sizeof(k6_data)); - memcpy(Confounder, (unsigned char *)tvb_get_ptr(pinfo->gssapi_wrap_tvb, 24, 8), 8); + tvb_memcpy(pinfo->gssapi_wrap_tvb, Confounder, 24, 8); crypt_rc4(&rc4_state, Confounder, 8); memcpy(output_message_buffer, input_message_buffer, datalen); crypt_rc4(&rc4_state, output_message_buffer, datalen); } else { - memcpy(Confounder, - tvb_get_ptr(pinfo->gssapi_wrap_tvb, 24, 8), - 8); /* Confounder */ + tvb_memcpy(pinfo->gssapi_wrap_tvb, Confounder, 24, 8); memcpy(output_message_buffer, input_message_buffer, datalen); @@ -1037,9 +1035,7 @@ decrypt_arcfour(packet_info *pinfo, return -10; } - cmp = memcmp(cksum_data, - tvb_get_ptr(pinfo->gssapi_wrap_tvb, 16, 8), - 8); /* SGN_CKSUM */ + cmp = tvb_memeql(pinfo->gssapi_wrap_tvb, 16, cksum_data, 8); /* SGN_CKSUM */ if (cmp) { return -11; } |