diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-05-06 22:34:05 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-05-06 22:34:05 +0000 |
| commit | 4c692a62b6a0851f8c96dbb3abe73a5e019f7b3e (patch) | |
| tree | fb70b87f27909b5615ccfb0512abc1ff67a04148 /plugins | |
| parent | 1103a38976ef39ce9461867c65cc998eb36423fa (diff) | |
Start introducing actx to ber functions.
svn path=/trunk/; revision=21705
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/asn1/asn1.h | 45 | ||||
| -rw-r--r-- | plugins/asn1/packet-asn1.c | 1 |
2 files changed, 45 insertions, 1 deletions
diff --git a/plugins/asn1/asn1.h b/plugins/asn1/asn1.h index d967779434..e07783fa19 100644 --- a/plugins/asn1/asn1.h +++ b/plugins/asn1/asn1.h @@ -35,6 +35,51 @@ #define ASN1_CTX 2 /* Context */ #define ASN1_PRV 3 /* Private */ +#define BER_CLASS_UNI 0 +#define BER_CLASS_APP 1 +#define BER_CLASS_CON 2 +#define BER_CLASS_PRI 3 +#define BER_CLASS_ANY 99 /* dont check class nor tag */ + +#define BER_UNI_TAG_EOC 0 /* 'end-of-content' */ +#define BER_UNI_TAG_BOOLEAN 1 +#define BER_UNI_TAG_INTEGER 2 +#define BER_UNI_TAG_BITSTRING 3 +#define BER_UNI_TAG_OCTETSTRING 4 +#define BER_UNI_TAG_NULL 5 +#define BER_UNI_TAG_OID 6 /* OBJECT IDENTIFIER */ +#define BER_UNI_TAG_ObjectDescriptor 7 +#define BER_UNI_TAG_EXTERNAL 8 +#define BER_UNI_TAG_REAL 9 +#define BER_UNI_TAG_ENUMERATED 10 +#define BER_UNI_TAG_EMBEDDED_PDV 11 +#define BER_UNI_TAG_UTF8String 12 +#define BER_UNI_TAG_RELATIVE_OID 13 +/* UNIVERSAL 14-15 + * Reserved for future editions of this + * Recommendation | International Standard + */ +#define BER_UNI_TAG_SEQUENCE 16 /* SEQUENCE, SEQUENCE OF */ +#define BER_UNI_TAG_SET 17 /* SET, SET OF */ +/* UNIVERSAL 18-22 Character string types */ +#define BER_UNI_TAG_NumericString 18 +#define BER_UNI_TAG_PrintableString 19 +#define BER_UNI_TAG_TeletexString 20 /* TeletextString, T61String */ +#define BER_UNI_TAG_VideotexString 21 +#define BER_UNI_TAG_IA5String 22 +/* UNIVERSAL 23-24 Time types */ +#define BER_UNI_TAG_UTCTime 23 +#define BER_UNI_TAG_GeneralizedTime 24 +/* UNIVERSAL 25-30 Character string types */ +#define BER_UNI_TAG_GraphicString 25 +#define BER_UNI_TAG_VisibleString 26 /* VisibleString, ISO64String */ +#define BER_UNI_TAG_GeneralString 27 +#define BER_UNI_TAG_UniversalString 28 +#define BER_UNI_TAG_CHARACTERSTRING 29 +#define BER_UNI_TAG_BMPString 30 +/* UNIVERSAL 31- ... + * Reserved for addenda to this Recommendation | International Standard + */ /* Tag */ #define ASN1_EOC 0 /* End Of Contents */ #define ASN1_BOL 1 /* Boolean */ diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c index 213ce4361e..aebb63eda9 100644 --- a/plugins/asn1/packet-asn1.c +++ b/plugins/asn1/packet-asn1.c @@ -82,7 +82,6 @@ #include <epan/report_err.h> #include <epan/emem.h> #include <epan/dissectors/packet-tcp.h> -#include <epan/dissectors/packet-ber.h> #include <plugins/asn1/asn1.h> #include <wiretap/file_util.h> |