From 632dcd0d77aa726cd7663fda6c95467bef676763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Sun, 20 Feb 2011 15:03:09 +0000 Subject: Add changes in r35384 to template file. svn path=/trunk/; revision=36009 --- asn1/spnego/packet-spnego-template.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'asn1') diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index 098893c30b..88781274bd 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -490,7 +490,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)); @@ -520,14 +520,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); @@ -556,9 +554,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; } -- cgit v1.2.3