osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Update to use the -X and -T asn2wrs flags. 

svn path=/trunk/; revision=23366
This commit is contained in:
Anders Broman 2007-11-05 20:41:44 +00:00
parent 8676c5cd9f
commit 3b1f0881e2
16 changed files with 1577 additions and 3066 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/acse/Makefile.common
View File

@ -46,7 +46,7 @@ SRC_FILES = \
$(EXTRA_DIST) \
$(EXT_ASN_FILE_LIST)
A2W_FLAGS= -b -e
A2W_FLAGS= -b -e -X -T
EXTRA_CNF= \
../x509if/x509if-exp.cnf

69
asn1/acse/acse.cnf
View File

@ -15,45 +15,28 @@ ASO-qualifier
AE-invocation-identifier
#.TYPE_RENAME
AARQ-apdu/protocol-version T_AARQ_protocol_version
AARE-apdu/protocol-version T_AARE_protocol_version
AARQ-apdu/aSO-context-name T_AARQ_aSO_context_name
AARE-apdu/aSO-context-name T_AARE_aSO_context_name
ACRQ-apdu/aSO-context-name T_ACRQ_aSO_context_name
ACRP-apdu/aSO-context-name T_ACRP_aSO_context_name
AARQ-apdu/_untag/protocol-version T_AARQ_protocol_version
AARE-apdu/_untag/protocol-version T_AARE_protocol_version
AARQ-apdu/_untag/aSO-context-name T_AARQ_aSO_context_name
AARE-apdu/_untag/aSO-context-name T_AARE_aSO_context_name
ACRQ-apdu/_untag/aSO-context-name T_ACRQ_aSO_context_name
ACRP-apdu/_untag/aSO-context-name T_ACRP_aSO_context_name
#.FIELD_RENAME
AARQ-apdu/user-information aARQ_user_information
AARE-apdu/user-information aARE_user_information
ABRT-apdu/user-information aBRT_user_information
RLRE-apdu/user-information rLRE_user_information
RLRQ-apdu/user-information rLRQ_user_information
AARE-apdu/result aARE_result
AARQ-apdu/_untag/user-information aARQ_user_information
AARE-apdu/_untag/user-information aARE_user_information
ABRT-apdu/_untag/user-information aBRT_user_information
RLRE-apdu/_untag/user-information rLRE_user_information
RLRQ-apdu/_untag/user-information rLRQ_user_information
P-context-result-list/_item/result pcontext_result
RLRE-apdu/reason rLRE_reason
RLRQ-apdu/reason rLRQ_reason
AARQ-apdu/protocol-version aARQ_protocol_version
AARE-apdu/protocol-version aARE_protocol_version
AARQ-apdu/aSO-context-name aARQ_aSO_context_name
AARE-apdu/aSO-context-name aARE_aSO_context_name
ACRQ-apdu/aSO-context-name aCRQ_aSO_context_name
RLRE-apdu/_untag/reason rLRE_reason
RLRQ-apdu/_untag/reason rLRQ_reason
AARQ-apdu/_untag/protocol-version aARQ_protocol_version
AARE-apdu/_untag/protocol-version aARE_protocol_version
AARQ-apdu/_untag/aSO-context-name aARQ_aSO_context_name
AARE-apdu/_untag/aSO-context-name aARE_aSO_context_name
ACRQ-apdu/_untag/aSO-context-name aCRQ_aSO_context_name
#.FN_BODY EXTERNALt
gint8 class;
gboolean pc, ind_field;
gint32 tag;
guint32 len1;
if(!implicit_tag) {
/* XXX asn2wrs can not yet handle tagged assignment so for the
* time being just remove this tag manually inside the EXTERNAL
* dissector.
*/
offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
EXTERNALt_sequence, hf_index, ett_acse_EXTERNALt);
#.FN_PARS Authentication-value-other/other-mechanism-name
FN_VARIANT = _str VAL_PTR = &object_identifier_id
@ -64,23 +47,23 @@ ACRQ-apdu/aSO-context-name aCRQ_aSO_context_name
#.FN_BODY PDV-list/presentation-data-values/simple-ASN1-type
/*XXX not implemented yet */
#.FN_BODY AARQ-apdu/aSO-context-name
#.FN_BODY AARQ-apdu/_untag/aSO-context-name
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset,
hf_index, &object_identifier_id);
#.FN_BODY AARE-apdu/aSO-context-name
#.FN_BODY AARE-apdu/_untag/aSO-context-name
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset,
hf_index, &object_identifier_id);
#.FN_BODY ACRQ-apdu/aSO-context-name
#.FN_BODY ACRQ-apdu/_untag/aSO-context-name
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset,
hf_index, &object_identifier_id);
#.FN_BODY ACRP-apdu/aSO-context-name
#.FN_BODY ACRP-apdu/_untag/aSO-context-name
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset,
hf_index, &object_identifier_id);
#.FN_BODY EXTERNALt/indirect-reference
#.FN_BODY EXTERNALt/_untag/indirect-reference
char *oid;
offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset,
hf_acse_indirect_reference,
@ -94,13 +77,13 @@ ACRQ-apdu/aSO-context-name aCRQ_aSO_context_name
if(session)
session->pres_ctx_id = indir_ref;
#.FN_PARS EXTERNALt/direct-reference
#.FN_PARS EXTERNALt/_untag/direct-reference
FN_VARIANT = _str VAL_PTR = &object_identifier_id
#.FN_BODY EXTERNALt/encoding/single-ASN1-type
#.FN_BODY EXTERNALt/_untag/encoding/single-ASN1-type
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree);
#.FN_BODY EXTERNALt/encoding/octet-aligned
#.FN_BODY EXTERNALt/_untag/encoding/octet-aligned
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree);
#.FN_PARS Release-request-reason

2
asn1/x509af/Makefile.common
View File

@ -45,7 +45,7 @@ SRC_FILES = \
$(EXTRA_DIST) \
$(EXT_ASN_FILE_LIST)
A2W_FLAGS= -b -e
A2W_FLAGS= -b -e -X -T
EXTRA_CNF= \
../x509ce/x509ce-exp.cnf \

2
asn1/x509ce/Makefile.common
View File

@ -45,7 +45,7 @@ SRC_FILES = \
$(EXTRA_DIST) \
$(EXT_ASN_FILE_LIST)
A2W_FLAGS= -b -e
A2W_FLAGS= -b -e -X -T
EXTRA_CNF= \
../x411/x411-exp.cnf \

2
asn1/x509if/Makefile.common
View File

@ -46,7 +46,7 @@ SRC_FILES = \
$(EXTRA_DIST) \
$(EXT_ASN_FILE_LIST)
A2W_FLAGS= -b -e
A2W_FLAGS= -b -e -X -T
EXTRA_CNF= \
../x509sat/x509sat-exp.cnf

2
asn1/x509sat/Makefile.common
View File

@ -46,7 +46,7 @@ SRC_FILES = \
$(EXTRA_DIST) \
$(EXT_ASN_FILE_LIST)
A2W_FLAGS= -b -e
A2W_FLAGS= -b -e -X -T
EXTRA_CNF= \
../x509if/x509if-exp.cnf

990
epan/dissectors/packet-acse.c
View File

File diff suppressed because it is too large Load Diff

2
epan/dissectors/packet-acse.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-acse.h */
/* ../../tools/asn2wrs.py -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */
/* ../../tools/asn2wrs.py -b -e -X -T -p acse -c acse.cnf -s packet-acse-template acse.asn */
/* Input file: packet-acse-template.h */

628
epan/dissectors/packet-x509af.c
View File

File diff suppressed because it is too large Load Diff

2
epan/dissectors/packet-x509af.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-x509af.h */
/* ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
/* ../../tools/asn2wrs.py -b -e -X -T -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
/* Input file: packet-x509af-template.h */

880
epan/dissectors/packet-x509ce.c
View File

File diff suppressed because it is too large Load Diff

4
epan/dissectors/packet-x509ce.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x509ce.h */
/* ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
/* packet-x509ce.h */
/* ../../tools/asn2wrs.py -b -e -X -T -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
/* Input file: packet-x509ce-template.h */

1234
epan/dissectors/packet-x509if.c
View File

File diff suppressed because it is too large Load Diff

2
epan/dissectors/packet-x509if.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-x509if.h */
/* ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
/* ../../tools/asn2wrs.py -b -e -X -T -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
/* Input file: packet-x509if-template.h */

820
epan/dissectors/packet-x509sat.c
View File

File diff suppressed because it is too large Load Diff

2
epan/dissectors/packet-x509sat.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-x509sat.h */
/* ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
/* ../../tools/asn2wrs.py -b -e -X -T -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
/* Input file: packet-x509sat-template.h */