diff options
Diffstat (limited to 'epan/dissectors/packet-c1222.c')
| -rw-r--r-- | epan/dissectors/packet-c1222.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 98d5e4022d..1b31d86f36 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -34,6 +34,9 @@ #include "config.h" #include <glib.h> + +#include <wsutil/eax.h> + #include <epan/conversation.h> #include <epan/expert.h> #include <epan/packet.h> @@ -42,7 +45,6 @@ #include <epan/dissectors/packet-ber.h> #include <epan/dissectors/packet-tcp.h> #include <epan/uat.h> -#include <epan/crypt/eax.h> #include <stdio.h> #include <string.h> @@ -123,7 +125,7 @@ static int hf_c1222_c1221_auth_request = -1; /* OCTET_STRING_SIZE_1_255 */ static int hf_c1222_c1221_auth_response = -1; /* OCTET_STRING_SIZE_CONSTR002 */ /*--- End of included file: packet-c1222-hf.c ---*/ -#line 91 "../../asn1/c1222/packet-c1222-template.c" +#line 93 "../../asn1/c1222/packet-c1222-template.c" /* These are the EPSEM pieces */ /* first, the flag components */ static int hf_c1222_epsem_flags = -1; @@ -228,7 +230,7 @@ static gint ett_c1222_Calling_authentication_value_c1222_U = -1; static gint ett_c1222_Calling_authentication_value_c1221_U = -1; /*--- End of included file: packet-c1222-ett.c ---*/ -#line 184 "../../asn1/c1222/packet-c1222-template.c" +#line 186 "../../asn1/c1222/packet-c1222-template.c" static expert_field ei_c1222_command_truncated = EI_INIT; static expert_field ei_c1222_bad_checksum = EI_INIT; @@ -533,7 +535,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm *offset += 2; *length -= 2; tblsize -= 2; - } + } proto_tree_add_item(tree, hf_c1222_write_data, tvb, *offset, tblsize, ENC_NA); *offset += tblsize; *length -= tblsize; @@ -1448,7 +1450,7 @@ dissect_c1222_User_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int proto_item *tf = NULL; proto_tree *epsem_tree = NULL; FILL_START; - + /* get Tag and Length */ offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &end_device_class, &pc, &tag); offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind); @@ -1511,7 +1513,7 @@ static void dissect_MESSAGE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-c1222-fn.c ---*/ -#line 1017 "../../asn1/c1222/packet-c1222-template.c" +#line 1019 "../../asn1/c1222/packet-c1222-template.c" /** * Dissects a a full (reassembled) C12.22 message. @@ -1890,7 +1892,7 @@ void proto_register_c1222(void) { "OCTET_STRING_SIZE_CONSTR002", HFILL }}, /*--- End of included file: packet-c1222-hfarr.c ---*/ -#line 1299 "../../asn1/c1222/packet-c1222-template.c" +#line 1301 "../../asn1/c1222/packet-c1222-template.c" }; /* List of subtrees */ @@ -1912,7 +1914,7 @@ void proto_register_c1222(void) { &ett_c1222_Calling_authentication_value_c1221_U, /*--- End of included file: packet-c1222-ettarr.c ---*/ -#line 1309 "../../asn1/c1222/packet-c1222-template.c" +#line 1311 "../../asn1/c1222/packet-c1222-template.c" }; static ei_register_info ei[] = { |