diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-02-20 15:03:09 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-02-20 15:03:09 +0000 |
| commit | 632dcd0d77aa726cd7663fda6c95467bef676763 (patch) | |
| tree | 1233ca13b9d646303dc09e2f7a31fc09ca32f977 | |
| parent | 7180a53aff1fcc6688a675237c110d0d5ab9cdee (diff) | |
Add changes in r35384 to template file.
svn path=/trunk/; revision=36009
| -rw-r--r-- | asn1/spnego/packet-spnego-template.c | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-spnego.c | 4 |
2 files changed, 6 insertions, 10 deletions
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; } diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 366f7656bf..4349e45baa 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1961,7 +1961,7 @@ void proto_register_spnego(void) { NULL, HFILL }}, /*--- End of included file: packet-spnego-hfarr.c ---*/ -#line 1399 "packet-spnego-template.c" +#line 1395 "packet-spnego-template.c" }; /* List of subtrees */ @@ -1983,7 +1983,7 @@ void proto_register_spnego(void) { &ett_spnego_InitialContextToken_U, /*--- End of included file: packet-spnego-ettarr.c ---*/ -#line 1409 "packet-spnego-template.c" +#line 1405 "packet-spnego-template.c" }; /* Register protocol */ |