From Grame Lunt:

Attached is a patch that updates - 

* DOP - This has now been successfully tested and so is now enabled by default and workaround code removed. 
Also now uses the correct EXPORTs from the other modules/dissectors.

* X509SAT - Most of the selected attributes are now supported in addition to the DirectoryString syntax attributes. This includes restoring the correct DirectoryString syntax and also providing the basic syntaxes (e.g. OBJECT IDENTIFIER, PrintableString). The latter requires a sed line in the Makefile which I assume should be OK? Not all the SAT can be defined in x509sat - so some have been included in x509if and x509af - though x509sat.cnf contains the master list and references the other dissectors where appropriate.

(I still prefer a syntax registration approach but I don't think that is going to be agreed in the short term.)

* X509IF - a mechanism to register some formating, based upon the hf_index, that is used in the cnf file.

* A couple of fixes identified by Stig.

Note the patc for dop did not apply don't regenerate dissectors yet.

svn path=/trunk/; revision=16799

4 files changed, 9 insertions, 10 deletions

diff --git a/asn1/disp/disp.asn b/asn1/disp/disp.asn
index 05a75c2598..f52e41935a 100644
--- a/asn1/disp/disp.asn
+++ b/asn1/disp/disp.asn
@@ -134,7 +134,7 @@ AttributeSelection ::= SET OF ClassAttributeSelection
 
 ClassAttributeSelection ::= SEQUENCE {
   class            OBJECT IDENTIFIER OPTIONAL,
-  classAttributes  ClassAttributes -- DEFAULT allAttributes:NULL
+  classAttributes  ClassAttributes -- DEFAULT allAttributes:NULL -- OPTIONAL
 }
 
 ClassAttributes ::= CHOICE {
diff --git a/asn1/disp/disp.cnf b/asn1/disp/disp.cnf
index 1114e9dbec..f8fe639e3d 100644
--- a/asn1/disp/disp.cnf
+++ b/asn1/disp/disp.cnf
@@ -8,7 +8,7 @@ ACSE-1			acse
 DirectoryAbstractService	dap
 DistributedOperations		dsp
 DSAOperationalAttributeTypes	dop
-OperationalBindingManagement	dap
+OperationalBindingManagement	dop
 
 #.INCLUDE ../x509if/x509if-exp.cnf
 #.INCLUDE ../x509af/x509af-exp.cnf
@@ -17,6 +17,9 @@ OperationalBindingManagement	dap
 #.INCLUDE ../dop/dop-exp.cnf
 #.INCLUDE ../acse/acse-exp.cnf
 
+#.EXPORTS
+AgreementID
+
 #.TYPE_RENAME
 CoordinateShadowUpdateArgumentData/updateStrategy/standard	StandardUpdate
 
@@ -35,13 +38,6 @@ EstablishParameter	B "dop.establish.roleb.2.5.19.1" 	"shadow-establish-roleb"
 ModificationParameter 	B "dop.modify.rolea.2.5.19.1" 	"shadow-modify-rolea"
 ModificationParameter 	B "dop.modify.roleb.2.5.19.1" 	"shadow-modify-roleb"
 
-# these are useful to Thales DOP 
-ShadowingAgreementInfo	B "dop.agreement.2.5.1.0.2.1" 	"shadow-agreement"
-EstablishParameter	B "dop.establish.rolea.2.5.1.0.2.1" 	"shadow-establish-rolea"
-EstablishParameter	B "dop.establish.roleb.2.5.1.0.2.1" 	"shadow-establish-roleb"
-ModificationParameter 	B "dop.modify.rolea.2.5.1.0.2.1" 	"shadow-modify-rolea"
-ModificationParameter 	B "dop.modify.roleb.2.5.1.0.2.1" 	"shadow-modify-roleb"
-
 #.FN_PARS T_standard
 	VAL_PTR = &update
 
@@ -125,4 +121,3 @@ ModificationParameter 	B "dop.modify.roleb.2.5.1.0.2.1" 	"shadow-modify-roleb"
   if (check_col(pinfo->cinfo, COL_INFO)) {
 	col_append_fstr(pinfo->cinfo, COL_INFO, " %%s", val_to_str(problem, disp_ShadowProblem_vals, "ShadowProblem(%%d)"));
   }
-
diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c
index 9087fa8181..3870a42ca2 100644
--- a/asn1/disp/packet-disp-template.c
+++ b/asn1/disp/packet-disp-template.c
@@ -263,6 +263,9 @@ void proto_reg_handoff_disp(void) {
 
   tpkt_handle = find_dissector("tpkt");
 
+  /* DNs */
+  x509if_register_fmt(hf_disp_contextPrefix, "cp=");
+
 }
 
 
diff --git a/asn1/disp/packet-disp-template.h b/asn1/disp/packet-disp-template.h
index 7f5d212e5a..bb6f8f3503 100644
--- a/asn1/disp/packet-disp-template.h
+++ b/asn1/disp/packet-disp-template.h
@@ -26,5 +26,6 @@
 #ifndef PACKET_DISP_H
 #define PACKET_DISP_H
 
+#include "packet-disp-exp.h"
 
 #endif  /* PACKET_DISP_H */