aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/pres
diff options
context:
space:
mode:
authorGraeme Lunt <graeme.lunt@smhs.co.uk>2010-06-29 18:09:03 +0000
committerGraeme Lunt <graeme.lunt@smhs.co.uk>2010-06-29 18:09:03 +0000
commit6fc0e7cb8c531730dd206102b25211ebfac60788 (patch)
tree60d97463e346b47e4196754f7b25fbb023533c8f /asn1/pres
parent4095079e1cf06b2a576377e0b2d363fa424ef4d7 (diff)
Interpret single-ASN1-type as ASN.1 and not as an OCTET STRING.
svn path=/trunk/; revision=33375
Diffstat (limited to 'asn1/pres')
-rw-r--r--asn1/pres/ISO8823-PRESENTATION.asn2
-rw-r--r--asn1/pres/pres.cnf1
2 files changed, 1 insertions, 2 deletions
diff --git a/asn1/pres/ISO8823-PRESENTATION.asn b/asn1/pres/ISO8823-PRESENTATION.asn
index 382a138db1..6cd60d2675 100644
--- a/asn1/pres/ISO8823-PRESENTATION.asn
+++ b/asn1/pres/ISO8823-PRESENTATION.asn
@@ -368,7 +368,7 @@ PDV-list ::= SEQUENCE {
transfer-syntax-name Transfer-syntax-name OPTIONAL,
presentation-context-identifier Presentation-context-identifier,
presentation-data-values
- CHOICE {single-ASN1-type [0] IMPLICIT OCTET STRING,
+ CHOICE {single-ASN1-type [0] ANY,
-- [0] ABSTRACT-SYNTAX.&Type
-- (CONSTRAINED BY {
diff --git a/asn1/pres/pres.cnf b/asn1/pres/pres.cnf
index 4e573ef2fd..8ba9278ca6 100644
--- a/asn1/pres/pres.cnf
+++ b/asn1/pres/pres.cnf
@@ -47,7 +47,6 @@ CPR-PPDU/normal-mode-parameters/provider-reason cPR_PPDU__provider-reason
proto_item *ti = proto_tree_add_text(tree, tvb, offset, -1,"dissector is not available");
expert_add_info_format(actx->pinfo, ti, PI_UNDECODED, PI_WARN, "Dissector is not available");
}
- %(DEFAULT_BODY)s
}
#.FN_BODY PDV-list/presentation-data-values/octet-aligned