diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-12-16 06:47:22 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-12-16 06:47:22 +0000 |
| commit | 483ec5bd0548f9720551737670c163fba32c3a8e (patch) | |
| tree | 9bcacac0d821309d6bc8e8d748dddb8791e40eb4 /asn1 | |
| parent | 163252a41c8f6ce7b233de6db317422647757d04 (diff) | |
| download | wireshark-483ec5bd0548f9720551737670c163fba32c3a8e.tar.gz wireshark-483ec5bd0548f9720551737670c163fba32c3a8e.tar.bz2 wireshark-483ec5bd0548f9720551737670c163fba32c3a8e.zip | |
From Graeme Lunt:
* 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.
svn path=/trunk/; revision=16814
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/dap/packet-dap-template.c | 1 | ||||
| -rw-r--r-- | asn1/dop/dop.asn | 8 | ||||
| -rw-r--r-- | asn1/h225/Makefile.nmake | 4 | ||||
| -rw-r--r-- | asn1/tcap/Makefile.nmake | 4 |
4 files changed, 5 insertions, 12 deletions
diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c index 9d5a0e24f9..70a3ce74ac 100644 --- a/asn1/dap/packet-dap-template.c +++ b/asn1/dap/packet-dap-template.c @@ -45,6 +45,7 @@ #include "packet-crmf.h" #include "packet-dsp.h" +#include "packet-disp.h" #include "packet-dap.h" #include <epan/strutil.h> diff --git a/asn1/dop/dop.asn b/asn1/dop/dop.asn index cea41dc89e..f7ddeb0180 100644 --- a/asn1/dop/dop.asn +++ b/asn1/dop/dop.asn @@ -278,8 +278,6 @@ dSAOperationalBindingManagementUnbind OPERATION ::= directoryUnbind EstablishOperationalBindingArgumentData ::= -- OPTIONALLY-PROTECTED-SEQ -- {-- SEQUENCE {bindingType [0] --OPERATIONAL-BINDING.&id({OpBindingSet}) -- OBJECT IDENTIFIER, --- The following line, whilst wrong, helps with Thales DOP dissection --- bindingID [1] IMPLICIT OperationalBindingID OPTIONAL, bindingID [1] OperationalBindingID OPTIONAL, accessPoint [2] AccessPoint, -- symmetric, Role A initiates, or Role B initiates @@ -329,8 +327,6 @@ Time ::= CHOICE {utcTime UTCTime, EstablishOperationalBindingResult ::= -- OPTIONALLY-PROTECTED-SEQ -- {-- SEQUENCE {bindingType [0] --OPERATIONAL-BINDING.&id({OpBindingSet}) -- OBJECT IDENTIFIER, --- The following line, whilst wrong, helps with Thales DOP dissection --- bindingID [1] IMPLICIT OperationalBindingID OPTIONAL, bindingID [1] OperationalBindingID OPTIONAL, accessPoint [2] AccessPoint, -- symmetric, Role A replies , or Role B replies @@ -361,8 +357,6 @@ EstablishOperationalBindingResult ::= ModifyOperationalBindingArgumentData ::= -- OPTIONALLY-PROTECTED-SEQ -- {--SEQUENCE {bindingType [0] --OPERATIONAL-BINDING.&id({OpBindingSet})-- OBJECT IDENTIFIER, --- The following line, whilst wrong, helps with Thales DOP dissection --- bindingID [1] IMPLICIT OperationalBindingID, bindingID [1] OperationalBindingID, accessPoint [2] AccessPoint OPTIONAL, -- symmetric, Role A initiates, or Role B initiates @@ -429,8 +423,6 @@ ModifyOperationalBindingResultData ::= SEQUENCE { TerminateOperationalBindingArgumentData ::= -- OPTIONALLY-PROTECTED-SEQ -- {-- SEQUENCE {bindingType [0] --OPERATIONAL-BINDING.&id({OpBindingSet})-- OBJECT IDENTIFIER, --- The following line, whilst wrong, helps with Thales DOP dissection --- bindingID [1] IMPLICIT OperationalBindingID, bindingID [1] OperationalBindingID, -- symmetric, Role A initiates, or Role B initiates initiator diff --git a/asn1/h225/Makefile.nmake b/asn1/h225/Makefile.nmake index 7d0f5b4f55..1e114438da 100644 --- a/asn1/h225/Makefile.nmake +++ b/asn1/h225/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d - xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y diff --git a/asn1/tcap/Makefile.nmake b/asn1/tcap/Makefile.nmake index 1c5839b240..a465d7b81d 100644 --- a/asn1/tcap/Makefile.nmake +++ b/asn1/tcap/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d - xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y |