diff options
author | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-06-28 11:23:56 +0000 |
---|---|---|
committer | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-06-28 11:23:56 +0000 |
commit | 9c6a926f9eaed493ea53d8017882a209453b215e (patch) | |
tree | 4f1772726415f136b6aec9b4516623cce1c7eac4 /asn1 | |
parent | 43e6fdfffaeace7fa34786bf3f22fdf00aa91f4d (diff) |
addition of NBS9
and bugfix for FTAM where we sometimes forgot to check if the tag was implicit.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14802 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
-rwxr-xr-x | asn1/ftam/ISO8571-FTAM.asn | 6 | ||||
-rwxr-xr-x | asn1/ftam/ftam.cnf | 497 |
2 files changed, 273 insertions, 230 deletions
diff --git a/asn1/ftam/ISO8571-FTAM.asn b/asn1/ftam/ISO8571-FTAM.asn index 2d1ce0249e..1b37848d94 100755 --- a/asn1/ftam/ISO8571-FTAM.asn +++ b/asn1/ftam/ISO8571-FTAM.asn @@ -4,6 +4,8 @@ -- this ASN.1 module is part of ISO/IEC 8571-4:1988; -- see the ISO|IEC text itself for full legal notices. -- +-- Manually added NBS9 +-- ISO8571-FTAM {iso(1) standard(0) 8571 application-context(1) iso-ftam(1)} DEFINITIONS ::= BEGIN @@ -16,7 +18,9 @@ PDU ::= CHOICE { fTAM-Regime-PDU FTAM-Regime-PDU, file-PDU File-PDU, bulk-Data-PDU Bulk-Data-PDU, - fSM-PDU FSM-PDU + fSM-PDU FSM-PDU, + -- NBS9 + nBS9 [PRIVATE 2] IMPLICIT F-READ-ATTRIB-response } FTAM-Regime-PDU ::= CHOICE { diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf index c968aa4f3a..8450521859 100755 --- a/asn1/ftam/ftam.cnf +++ b/asn1/ftam/ftam.cnf @@ -87,12 +87,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_restricted_string(TRUE, 1, pinfo, tree, tvb, offset, hf_index, NULL); @@ -103,12 +104,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_bitstring(TRUE, pinfo, tree, tvb, offset, Protocol_Version_bits, hf_index, ett_ftam_Protocol_Version, NULL); @@ -119,12 +121,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_bitstring(TRUE, pinfo, tree, tvb, offset, Service_Class_bits, hf_index, ett_ftam_Service_Class, NULL); @@ -135,12 +138,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_bitstring(TRUE, pinfo, tree, tvb, offset, Functional_Units_bits, hf_index, ett_ftam_Functional_Units, NULL); @@ -152,12 +156,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_bitstring(TRUE, pinfo, tree, tvb, offset, Attribute_Groups_bits, hf_index, ett_ftam_Attribute_Groups, NULL); @@ -169,12 +174,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_index, NULL); @@ -184,12 +190,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence_of(TRUE, pinfo, tree, tvb, offset, Contents_Type_List_sequence_of, hf_index, ett_ftam_Contents_Type_List); @@ -200,12 +207,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_index, NULL); @@ -215,12 +223,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_index, NULL); @@ -230,12 +239,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_object_identifier(TRUE, pinfo, tree, tvb, offset, hf_index, NULL); @@ -246,12 +256,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence(TRUE, pinfo, tree, tvb, offset, Access_Context_sequence, hf_index, ett_ftam_Access_Context); @@ -261,12 +272,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence(TRUE, pinfo, tree, tvb, offset, Access_Passwords_sequence, hf_index, ett_ftam_Access_Passwords); @@ -276,12 +288,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_bitstring(TRUE, pinfo, tree, tvb, offset, Access_Request_bits, hf_index, ett_ftam_Access_Request, NULL); @@ -291,12 +304,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_restricted_string(TRUE, 4, pinfo, tree, tvb, offset, hf_index, NULL); @@ -306,12 +320,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_index, NULL); @@ -322,28 +337,29 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_index, NULL); - #.FN_BODY Change-Attributes gint8 class; gboolean pc, ind_field; gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence(TRUE, pinfo, tree, tvb, offset, Change_Attributes_sequence, hf_index, ett_ftam_Change_Attributes); @@ -354,12 +370,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence_of(TRUE, pinfo, tree, tvb, offset, Charging_sequence_of, hf_index, ett_ftam_Charging); @@ -370,12 +387,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence(TRUE, pinfo, tree, tvb, offset, Concurrency_Control_sequence, hf_index, ett_ftam_Concurrency_Control); @@ -386,12 +404,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_object_identifier(TRUE, pinfo, tree, tvb, offset, hf_index, NULL); @@ -401,12 +420,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence(TRUE, pinfo, tree, tvb, offset, Create_Attributes_sequence, hf_index, ett_ftam_Create_Attributes); @@ -416,12 +436,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence_of(TRUE, pinfo, tree, tvb, offset, Diagnostic_sequence_of, hf_index, ett_ftam_Diagnostic); @@ -432,12 +453,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_object_identifier(TRUE, pinfo, tree, tvb, offset, hf_index, object_identifier_id); @@ -447,26 +469,29 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_index, NULL); + #.FN_BODY Read-Attributes gint8 class; gboolean pc, ind_field; gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence(TRUE, pinfo, tree, tvb, offset, Read_Attributes_sequence, hf_index, ett_ftam_Read_Attributes); @@ -476,12 +501,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence(TRUE, pinfo, tree, tvb, offset, Select_Attributes_sequence, hf_index, ett_ftam_Select_Attributes); @@ -491,12 +517,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_index, NULL); @@ -506,12 +533,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_restricted_string(TRUE, 22, pinfo, tree, tvb, offset, hf_index, NULL); @@ -521,12 +549,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence_of(TRUE, pinfo, tree, tvb, offset, Scope_sequence_of, hf_index, ett_ftam_Scope); @@ -536,27 +565,30 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence_of(TRUE, pinfo, tree, tvb, offset, Objects_Attributes_List_sequence_of, hf_index, ett_ftam_Objects_Attributes_List); + #.FN_BODY Path-Access-Passwords gint8 class; gboolean pc, ind_field; gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_sequence_of(TRUE, pinfo, tree, tvb, offset, Path_Access_Passwords_sequence_of, hf_index, ett_ftam_Path_Access_Passwords); @@ -566,12 +598,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_index, NULL); @@ -581,12 +614,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_acse_EXTERNAL(TRUE, tvb, offset, pinfo, tree, hf_index); #.FN_BODY Attribute-Value-Assertions @@ -595,12 +629,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ftam_OR_Set(TRUE, tvb, offset, pinfo, tree, hf_index); #.FN_BODY Referent-Indicator @@ -609,12 +644,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_boolean(TRUE, pinfo, tree, tvb, offset, hf_index); #.FN_BODY Password @@ -623,12 +659,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, Password_choice, hf_index, ett_ftam_Password, NULL); @@ -639,12 +676,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, FADU_Identity_choice, hf_index, ett_ftam_FADU_Identity, NULL); @@ -654,12 +692,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint32 tag; gint32 len1; - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - + if(!implicit_tag){ + /* XXX asn2eth can not yet handle tagged assignment yes so this + * XXX is some conformance file magic to work around that bug + */ + offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); + } offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, Operation_Result_choice, hf_index, ett_ftam_Operation_Result, NULL); |