aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/x509if
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2004-11-14 09:48:11 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2004-11-14 09:48:11 +0000
commite7082f51949e2b2ed8a872978d706ab2d110f5af (patch)
tree5ef1ad3594fa6861fea87f42b1ee00f4de5084ac /asn1/x509if
parent27df4809151328805ce219985edc8206fa462d94 (diff)
downloadwireshark-e7082f51949e2b2ed8a872978d706ab2d110f5af.tar.gz
wireshark-e7082f51949e2b2ed8a872978d706ab2d110f5af.tar.bz2
wireshark-e7082f51949e2b2ed8a872978d706ab2d110f5af.zip
Since we can now handle SEQUENCE OF ANY uncomment this "difficult" field from
the Attribute SEQUENCE to make it more complete. svn path=/trunk/; revision=12527
Diffstat (limited to 'asn1/x509if')
-rw-r--r--asn1/x509if/InformationFramework.asn12
-rw-r--r--asn1/x509if/x509if.cnf3
2 files changed, 6 insertions, 9 deletions
diff --git a/asn1/x509if/InformationFramework.asn b/asn1/x509if/InformationFramework.asn
index cf46c993b6..01b8c213b2 100644
--- a/asn1/x509if/InformationFramework.asn
+++ b/asn1/x509if/InformationFramework.asn
@@ -25,13 +25,13 @@ IMPORTS
AttributeId ::= OBJECT IDENTIFIER
---AttributeValue ::= ANY
---
+AttributeValue ::= ANY
+
-- attribute data types
Attribute ::= SEQUENCE {
- type AttributeId
--- value
--- SET SIZE (0..MAX) OF AttributeValue
+ type AttributeId,
+ values
+ SET SIZE (0..MAX) OF AttributeValue
-- valuesWithContext
-- SET SIZE (1..MAX) OF
-- SEQUENCE {value ANY,
@@ -96,7 +96,7 @@ RelativeDistinguishedName ::=
AttributeTypeAndDistinguishedValue ::= SEQUENCE {
type AttributeId,
- value ANY,
+ value AttributeValue,
primaryDistinguished BOOLEAN OPTIONAL
-- valuesWithContext
-- SET SIZE (1..MAX) OF
diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf
index 861ec0fa5c..e51db1fc3a 100644
--- a/asn1/x509if/x509if.cnf
+++ b/asn1/x509if/x509if.cnf
@@ -26,9 +26,6 @@ RDNSequence
#.FN_BODY AttributeValue
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
-#.FN_BODY AttributeTypeAndDistinguishedValue/value
- offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
-
#.END