aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/x509if
diff options
context:
space:
mode:
authorgal <gal@f5534014-38df-0310-8fa8-9805f1628bb7>2006-03-05 11:28:13 +0000
committergal <gal@f5534014-38df-0310-8fa8-9805f1628bb7>2006-03-05 11:28:13 +0000
commitfdb93faeb4c44867a7342c7a51fb2ee9aafbe866 (patch)
tree13f4e048c325a545eb8a27056dbcc0d0d312918f /asn1/x509if
parentc42725d2ae01e61c3d71c14b9088e55fb84b4d9e (diff)
ACP133 attribute syntaxes and attribute definitions used by the DAP, DSP and DISP dissectors. Also includes X.402 definitions and OID registrations for object classes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17471 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/x509if')
-rw-r--r--asn1/x509if/packet-x509if-template.c2
-rw-r--r--asn1/x509if/x509if-exp.cnf2
-rw-r--r--asn1/x509if/x509if.cnf22
3 files changed, 21 insertions, 5 deletions
diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c
index d184bfb10e..d9469c3d24 100644
--- a/asn1/x509if/packet-x509if-template.c
+++ b/asn1/x509if/packet-x509if-template.c
@@ -142,6 +142,6 @@ void proto_register_x509if(void) {
/*--- proto_reg_handoff_x509if -------------------------------------------*/
void proto_reg_handoff_x509if(void) {
-
+#include "packet-x509if-dis-tab.c"
}
diff --git a/asn1/x509if/x509if-exp.cnf b/asn1/x509if/x509if-exp.cnf
index b68cedbd93..d1ba7c40ca 100644
--- a/asn1/x509if/x509if-exp.cnf
+++ b/asn1/x509if/x509if-exp.cnf
@@ -14,7 +14,6 @@ AttributeTypeAndDistinguishedValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
SubtreeSpecification BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
LocalName BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
ChopSpecification BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-BaseDistance BER_CLASS_UNI BER_UNI_TAG_INTEGER
Refinement BER_CLASS_ANY/*choice*/ -1/*choice*/
AttributeUsage BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
DITStructureRule BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
@@ -57,7 +56,6 @@ AttributeTypeAndDistinguishedValue TYPE = FT_NONE DISPLAY = BASE_NONE STRING
SubtreeSpecification TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
LocalName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
ChopSpecification TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
-BaseDistance TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
Refinement TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x509if_Refinement_vals) BITMASK = 0
AttributeUsage TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x509if_AttributeUsage_vals) BITMASK = 0
DITStructureRule TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf
index 2452c0cb28..f3726d9291 100644
--- a/asn1/x509if/x509if.cnf
+++ b/asn1/x509if/x509if.cnf
@@ -18,7 +18,7 @@ AttributeTypeAssertion
AttributeUsage
AttributeValue
AttributeValueAssertion
-BaseDistance
+#BaseDistance
ChopSpecification
Context
ContextAssertion
@@ -97,7 +97,25 @@ DistinguishedName B "2.5.4.33" "id-at-roleOccupant"
DistinguishedName B "2.5.4.34" "id-at-seeAlso"
DistinguishedName B "2.5.4.49" "id-at-distinguishedName"
-
+# X402 - see master list in acp133.cnf
+DistinguishedName B "2.6.5.2.5" "id-at-mhs-message-store-dn"
+DistinguishedName B "2.6.5.2.14" "id-at-mhs-dl-related-lists"
+
+# ACP133 - see master list in acp133.cnf
+DistinguishedName B "2.16.840.1.101.2.2.1.3" "id-at-alternateRecipient"
+DistinguishedName B "2.16.840.1.101.2.2.1.4" "id-at-associatedOrganization"
+DistinguishedName B "2.16.840.1.101.2.2.1.6" "id-at-associatedPLA"
+DistinguishedName B "2.16.840.1.101.2.2.1.49" "id-at-aliasPointer"
+DistinguishedName B "2.16.840.1.101.2.2.1.61" "id-at-listPointer"
+DistinguishedName B "2.16.840.1.101.2.2.1.110" "id-at-administrator"
+DistinguishedName B "2.16.840.1.101.2.2.1.111" "id-at-aigsExpanded"
+DistinguishedName B "2.16.840.1.101.2.2.1.113" "id-at-associatedAL"
+DistinguishedName B "2.16.840.1.101.2.2.1.114" "id-at-copyMember"
+DistinguishedName B "2.16.840.1.101.2.2.1.117" "id-at-guard"
+DistinguishedName B "2.16.840.1.101.2.2.1.121" "id-at-networkDN"
+DistinguishedName B "2.16.840.1.101.2.2.1.138" "id-at-plasServed"
+DistinguishedName B "2.16.840.1.101.2.2.1.139" "id-at-deployed"
+DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison"
#.FN_PARS ContextId
FN_VARIANT = _str HF_INDEX = hf_x509if_object_identifier_id VAL_PTR = &object_identifier_id