aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/h235
diff options
context:
space:
mode:
authorTomas Kukosa <tomas.kukosa@siemens.com>2005-07-04 09:35:25 +0000
committerTomas Kukosa <tomas.kukosa@siemens.com>2005-07-04 09:35:25 +0000
commit5f2fd433abc60c0e5f97613fbb18a00090dddc26 (patch)
treef94d06201f1f3524613eee828b38eeeb7e0223f5 /asn1/h235
parentf88d8d41b5c4faa3884d97905d916f5f8a80eade (diff)
- use tvb instead of offset and length in dissect_per_octet_string() for value returning
- asn2eth: #.FN_PARS support for OCTET STRING - usage of #.FN_PARS in h225 and h245 - h225: ParallelH245Control support - h245: better support of NonStandardParameter - usage of MAX_OID_STR_LEN constant - all PER dissectors regenerated svn path=/trunk/; revision=14844
Diffstat (limited to 'asn1/h235')
-rw-r--r--asn1/h235/Makefile.nmake2
-rw-r--r--asn1/h235/h235-exp.cnf4
2 files changed, 3 insertions, 3 deletions
diff --git a/asn1/h235/Makefile.nmake b/asn1/h235/Makefile.nmake
index ffe13fabd9..502d9b59c0 100644
--- a/asn1/h235/Makefile.nmake
+++ b/asn1/h235/Makefile.nmake
@@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES)
$(DISSECTOR_FILES): ../../tools/asn2eth.py H235-SECURITY-MESSAGES.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf
!IFDEF PYTHON
- $(PYTHON) ../../tools/asn2eth.py -X -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template H235-SECURITY-MESSAGES.asn
+ $(PYTHON) ../../tools/asn2eth.py -X -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template H235-SECURITY-MESSAGES.asn
!ELSE
@echo Error: You need Python to use asn2eth.py
@exit 1
diff --git a/asn1/h235/h235-exp.cnf b/asn1/h235/h235-exp.cnf
index 7014792629..c5bc2a4aec 100644
--- a/asn1/h235/h235-exp.cnf
+++ b/asn1/h235/h235-exp.cnf
@@ -1,10 +1,10 @@
#.TYPE_ATTR
TimeStamp TYPE = FT_ABSOLUTE_TIME DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
-AuthenticationMechanism TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(AuthenticationMechanism_vals) BITMASK = 0
+AuthenticationMechanism TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h235_AuthenticationMechanism_vals) BITMASK = 0
ClearToken TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
SIGNEDxxx TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
ENCRYPTEDxxx TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
HASHEDxxx TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
-CryptoToken TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(CryptoToken_vals) BITMASK = 0
+CryptoToken TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h235_CryptoToken_vals) BITMASK = 0
#.END