move DEFINE ...option=N to ATTRIBUTE ... N ...option

which is a little more consistent

diff --git a/share/dictionary/der/dictionary.common b/share/dictionary/der/dictionary.common
index bc9a4c36281011c797bf7fb8a9eeb2fc390fb362..19076548d8b2cb71da3eb48fc0f82233aca1ff12 100644 (file)
--- a/share/dictionary/der/dictionary.common
+++ b/share/dictionary/der/dictionary.common
@@ -52,9 +52,9 @@ END DirectoryName
 DEFINE GeneralSubtree                                  sequence
 BEGIN GeneralSubtree
 DEFINE base                                            sequence        clone=@.GeneralName
-DEFINE minimum                                         integer         has_default,option=0,optional
+ATTRIBUTE minimum                                      0       integer         has_default,option,optional
 VALUE  minimum                         DEFAULT                 0
-DEFINE maximum                                         integer         option=1,optional
+ATTRIBUTE maximum                                      1       integer         option,optional
 END GeneralSubtree
 
 DEFINE Name                                            sequence

diff --git a/share/dictionary/der/dictionary.crl b/share/dictionary/der/dictionary.crl
index d401562fa1e1499cfc4376861c93491727bd6857..5859ea8f857211f2dffd3b8a52c017b98d35af66 100644 (file)
--- a/share/dictionary/der/dictionary.crl
+++ b/share/dictionary/der/dictionary.crl
@@ -5,7 +5,7 @@
 
 DEFINE distributionPoint                               sequence size=1..
 BEGIN   distributionPoint
-DEFINE distributionPointName                           sequence  option=0,optional
+ATTRIBUTE distributionPointName                                0       sequence  option,optional
 BEGIN     distributionPointName
 ATTRIBUTE      fullName                                0       group   der_type=sequence,sequence_of=choice,ref=@.GeneralName,option
 ATTRIBUTE      nameRelativeToCRLIssuer                 1       sequence        option

diff --git a/share/dictionary/der/dictionary.extensions b/share/dictionary/der/dictionary.extensions
index 6ba21b1a0940db10ca3ba0dfb155e71aac1177b1..8a65274296beda0fb820ab51c14ff64168a25cce 100644 (file)
--- a/share/dictionary/der/dictionary.extensions
+++ b/share/dictionary/der/dictionary.extensions
@@ -51,8 +51,9 @@ END 2.5.29.19
 
 ATTRIBUTE      nameConstraints                         2.5.29.30       sequence        is_oid_leaf
 BEGIN 2.5.29.30
-DEFINE permittedSubtrees                               group   ref=@.GeneralSubtree,sequence_of=sequence,option=0,optional
-DEFINE excludedSubtrees                                group   ref=@.GeneralSubtree,sequence_of=sequence,option=1,optional
+ATTRIBUTE      permittedSubtrees                       0       group   ref=@.GeneralSubtree,sequence_of=sequence,option,optional
+ATTRIBUTE      permittedSubtrees                       0       group   ref=@.GeneralSubtree,sequence_of=sequence,option,optional
+ATTRIBUTE      excludedSubtrees                        1       group   ref=@.GeneralSubtree,sequence_of=sequence,option,optional
 END 2.5.29.30
 
 ATTRIBUTE      CRLDIstributionPoints                   2.5.29.31       sequence        sequence_of=sequence,is_oid_leaf
@@ -89,8 +90,8 @@ END 2.5.29.35
 
 ATTRIBUTE      policyConstraints                       2.5.29.36       sequence        is_oid_leaf
 BEGIN 2.5.29.36
-DEFINE requireExplicitPolicy                           octetstring option=0,optional
-DEFINE inhibitPolicyMapping                            octetstring option=1,optional
+ATTRIBUTE      requireExplicitPolicy                   0       octetstring option,optional
+ATTRIBUTE      inhibitPolicyMapping                    1       octetstring option,optional
 END 2.5.29.36
 
 ATTRIBUTE      extKeyUsage                             2.5.29.37       sequence        sequence_of=oid,size=1..,is_oid_leaf