diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-12-14 21:02:56 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-12-14 21:02:56 +0000 |
| commit | 404b556084233771a3425f4347d9b2f4a2d0c943 (patch) | |
| tree | 3a79d142c2fd214b996049fafc290d6534470787 /asn1/x509sat/x509sat-exp.cnf | |
| parent | 7980c9295e9cfe5f7c2dbdd3913c8c5a83dcc56b (diff) | |
| download | wireshark-404b556084233771a3425f4347d9b2f4a2d0c943.tar.gz | |
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
Diffstat (limited to 'asn1/x509sat/x509sat-exp.cnf')
| -rw-r--r-- | asn1/x509sat/x509sat-exp.cnf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asn1/x509sat/x509sat-exp.cnf b/asn1/x509sat/x509sat-exp.cnf index 6f411f0608..36a3c3e260 100644 --- a/asn1/x509sat/x509sat-exp.cnf +++ b/asn1/x509sat/x509sat-exp.cnf @@ -1,5 +1,5 @@ #.IMPORT_TAG -DirectoryString BER_CLASS_UNI BER_UNI_TAG_PrintableString +DirectoryString BER_CLASS_ANY/*choice*/ -1/*choice*/ UniqueIdentifier BER_CLASS_UNI BER_UNI_TAG_BITSTRING CountryName BER_CLASS_UNI BER_UNI_TAG_PrintableString Criteria BER_CLASS_ANY/*choice*/ -1/*choice*/ @@ -32,7 +32,7 @@ LocaleContextSyntax BER_CLASS_ANY/*choice*/ -1/*choice*/ #.END #.TYPE_ATTR -DirectoryString TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +DirectoryString TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x509sat_DirectoryString_vals) BITMASK = 0 UniqueIdentifier TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 CountryName TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 Criteria TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x509sat_Criteria_vals) BITMASK = 0 |