summaryrefslogtreecommitdiff
path: root/asn1/ftam
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2005-09-09 19:46:57 +0000
committerAnders Broman <anders.broman@ericsson.com>2005-09-09 19:46:57 +0000
commitbb18a56bbd8119fb955cc94f0c7d8e063a47082c (patch)
tree85ef9c964fa1e61cd72bda544165735f45945fcd /asn1/ftam
parent4b07f6747e19333ec7d466ee5525088426053021 (diff)
downloadwireshark-bb18a56bbd8119fb955cc94f0c7d8e063a47082c.tar.gz
Dissect "nbs-9".
svn path=/trunk/; revision=15742
Diffstat (limited to 'asn1/ftam')
-rw-r--r--asn1/ftam/ftam.cnf2
-rw-r--r--asn1/ftam/packet-ftam-template.c16
2 files changed, 16 insertions, 2 deletions
diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf
index 2092f2e3bc..bffe6f327a 100644
--- a/asn1/ftam/ftam.cnf
+++ b/asn1/ftam/ftam.cnf
@@ -69,7 +69,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
#.FN_BODY Extension-Attribute/extension-attribute
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
-#.FN_PARS Attribute-Extensions-Pattern/extension-set-attribute-Patterns/extension-attribute-identifier
+#.FN_PARS Attribute-Extensions-Pattern/_item/extension-set-attribute-Patterns/_item/extension-attribute-identifier
VAL_PTR = object_identifier_id
#.FN_BODY Attribute-Extensions-Pattern/_item/extension-set-attribute-Patterns/_item/extension-attribute-Pattern
diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c
index c737a6a297..ceffa589b8 100644
--- a/asn1/ftam/packet-ftam-template.c
+++ b/asn1/ftam/packet-ftam-template.c
@@ -123,8 +123,22 @@ void proto_register_ftam(void) {
void proto_reg_handoff_ftam(void) {
register_ber_oid_dissector("1.0.8571.1.1", dissect_ftam, proto_ftam,"iso-ftam(1)");
register_ber_oid_dissector("1.0.8571.2.1", dissect_ftam, proto_ftam,"ftam-pci(1)");
- register_ber_oid_name("1.3.14.5.5.9","NBS-9 FTAM file directory file");
+ register_ber_oid_dissector("1.3.14.5.2.2", dissect_ftam, proto_ftam,"NIST file directory entry abstract syntax");
+
+ /* Unstructured text file document type FTAM-1 */
+ register_ber_oid_name("1.0.8571.5.1","ISO FTAM unstructured text");
+ register_ber_oid_name("1.0.8571.2.3","FTAM unstructured text abstract syntax");
register_ber_oid_name("1.0.8571.3.1","FTAM hierarchical file model");
register_ber_oid_name("1.0.8571.4.1","FTAM unstructured constraint set");
+ /* Unstructured text file document type FTAM-3 */
+ register_ber_oid_name("1.0.8571.5.3","ISO FTAM unstructured binary");
+ register_ber_oid_name("1.0.8571.2.4","FTAM unstructured binary abstract syntax");
+
+ /* Filedirectory file document type NBS-9 */
+ register_ber_oid_name("1.3.14.5.5.9","NBS-9 FTAM file directory file");
+
+ /* Filedirectory file document type NBS-9 (WITH OLD NIST OIDs)*/
+ register_ber_oid_name("1.3.9999.1.5.9","NBS-9-OLD FTAM file directory file");
+ register_ber_oid_name("1.3.9999.1.2.2","NIST file directory entry abstract syntax");
}