Set svn:keywords to Id to expand RCS IDs, and set svn:eol-style to

native to canonicalize line endings.

svn path=/trunk/; revision=12203

5 files changed, 352 insertions, 352 deletions

diff --git a/asn1/x509af/AuthenticationFramework.asn b/asn1/x509af/AuthenticationFramework.asn
index 20617d8ccb..ba21daaa7b 100755
--- a/asn1/x509af/AuthenticationFramework.asn
+++ b/asn1/x509af/AuthenticationFramework.asn
@@ -1,272 +1,272 @@
--- Module AuthenticationFramework (X.509:08/1997)

-

-AuthenticationFramework {joint-iso-itu-t ds(5) module(1)

-  authenticationFramework(7) 3} DEFINITIONS ::=

-BEGIN

-

---  EXPORTS All 

---  The types and values defined in this module are exported for use in the other ASN.1 modules contained

---  within the Directory Specifications, and for the use of other applications which will use them to access

---  Directory services. Other applications may use them for their own purposes, but this will not constrain

---  extensions and modifications needed to maintain or improve the Directory service.

-IMPORTS

-  id-at, id-mr, informationFramework, upperBounds, selectedAttributeTypes,

-    basicAccessControl, certificateExtensions

-    FROM UsefulDefinitions {joint-iso-itu-t ds(5) module(1)

-      usefulDefinitions(0) 3}

-  Name, ATTRIBUTE, AttributeType, MATCHING-RULE, Attribute

-    FROM InformationFramework informationFramework

-  ub-user-password

-    FROM UpperBounds upperBounds

-  AuthenticationLevel

-    FROM BasicAccessControl basicAccessControl

-  UniqueIdentifier, octetStringMatch

-    FROM SelectedAttributeTypes selectedAttributeTypes

-  certificateExactMatch, certificatePairExactMatch, certificateListExactMatch,

-    GeneralNames

-    FROM CertificateExtensions certificateExtensions;

-

---  basic certificate definition

-Certificate ::= SEQUENCE {

-  signedCertificate SEQUENCE {

-               version                  [0]  Version DEFAULT v1,

-               serialNumber             CertificateSerialNumber,

-               signature                AlgorithmIdentifier,

-               issuer                   Name,

-               validity                 Validity,

-               subject                  Name,

-               subjectPublicKeyInfo     SubjectPublicKeyInfo,

-               issuerUniqueIdentifier   [1] IMPLICIT UniqueIdentifier OPTIONAL,

-               --  if present, version must be v2 or v3

-               subjectUniqueIdentifier  [2] IMPLICIT UniqueIdentifier OPTIONAL,

-               --  if present, version must be v2 or v3

-               extensions               [3]  Extensions OPTIONAL

-               --  If present, version must be v3 -- },

-  algorithmIdentifier  AlgorithmIdentifier,

-  encrypted            BIT STRING

-}

-

-Version ::= INTEGER {v1(0), v2(1), v3(2)}

-

-CertificateSerialNumber ::= INTEGER

-

--- Can not be handled by compiler. Handimplemented in the template

-AlgorithmIdentifier ::= SEQUENCE {

---  algorithm   ALGORITHM.&id({SupportedAlgorithms}),

---  parameters  ALGORITHM.&Type({SupportedAlgorithms}{@algorithm}) OPTIONAL

-}

-

---	Definition of the following information object set is deferred, perhaps to standardized

---	profiles or to protocol implementation conformance statements. The set is required to

---	specify a table constraint on the parameters component of AlgorithmIdentifier.

---SupportedAlgorithms ALGORITHM ::=

---{...}

-

-Validity ::= SEQUENCE {notBefore  Time,

-                       notAfter   Time

-}

-

-SubjectPublicKeyInfo ::= SEQUENCE {

-  algorithm         AlgorithmIdentifier,

-  subjectPublicKey  BIT STRING

-}

-

-Time ::= CHOICE {utcTime          UTCTime,

-                 generalizedTime  GeneralizedTime

-}

-

-Extensions ::= SEQUENCE OF Extension

-

---  For those extensions where ordering of individual extensions within the SEQUENCE is significant, the

---  specification of those individual extensions shall include the rules for the significance of the order therein

--- XXX Implemented by hand in the template

-Extension ::= SEQUENCE {

---  extnId     EXTENSION.&id({ExtensionSet}),

---  critical   BOOLEAN DEFAULT FALSE,

---  extnValue  OCTET STRING

---    contains a DER encoding of a value of type &ExtnType

---    for the extension object identified by extnId 

-}

-

---ExtensionSet EXTENSION ::=

---  {...}

-

---EXTENSION ::= CLASS {&id        OBJECT IDENTIFIER UNIQUE,

---                     &ExtnType  

---}WITH SYNTAX {SYNTAX &ExtnType

---              IDENTIFIED BY &id

---}

-

---  other certificate constructs

-Certificates ::= SEQUENCE {

-  userCertificate    Certificate,

-  certificationPath  ForwardCertificationPath OPTIONAL

-}

-

-ForwardCertificationPath ::= SEQUENCE OF CrossCertificates

-

-CrossCertificates ::= SET OF Certificate

-

-CertificationPath ::= SEQUENCE {

-  userCertificate    Certificate,

-  theCACertificates  SEQUENCE OF CertificatePair OPTIONAL

-}

-

-CertificatePair ::= SEQUENCE {

-  issuedByThisCA  [0]  Certificate OPTIONAL,

-  issuedToThisCA  [1]  Certificate OPTIONAL

-  --  at least one of the pair shall be present 

-}

-

---  Certificate Revocation List (CRL)

-CertificateList ::= SEQUENCE {

-    signedCertificateList SEQUENCE {

-               version              Version OPTIONAL,

-               --  if present, version must be v2

-               signature            AlgorithmIdentifier,

-               issuer               Name,

-               thisUpdate           Time,

-               nextUpdate           Time OPTIONAL,

-               revokedCertificates

-                 SEQUENCE OF

-                   SEQUENCE {userCertificate     CertificateSerialNumber,

-                             revocationDate      Time,

-                             crlEntryExtensions  Extensions OPTIONAL} OPTIONAL,

-               crlExtensions        [0]  Extensions OPTIONAL},

-  algorithmIdentifier  AlgorithmIdentifier,

-  encrypted            BIT STRING

-}

-

---  attribute certificate

-AttributeCertificationPath ::= SEQUENCE {

-  attributeCertificate  AttributeCertificate,

-  acPath                SEQUENCE OF ACPathData OPTIONAL

-}

-

-ACPathData ::= SEQUENCE {

-  certificate           [0]  Certificate OPTIONAL,

-  attributeCertificate  [1]  AttributeCertificate OPTIONAL

-}

-

---attributeCertificate ATTRIBUTE ::= {

---  WITH SYNTAX             AttributeCertificate

---  EQUALITY MATCHING RULE  attributeCertificateMatch

---  ID                      id-at-attributeCertificate

---}

-

-AttributeCertificate ::= SEQUENCE {

-  signedAttributeCertificateInfo AttributeCertificateInfo,

-  algorithmIdentifier  AlgorithmIdentifier,

-  encrypted            BIT STRING

-}

-

-AttributeCertificateInfo ::= SEQUENCE {

-  version                Version DEFAULT v1,

-  subject

-    CHOICE {baseCertificateID  [0]  IssuerSerial,

-            subjectName        [1]  GeneralNames

-           },

-  issuer                 GeneralNames,

-  signature              AlgorithmIdentifier,

-  serialNumber           CertificateSerialNumber,

-  attCertValidityPeriod  AttCertValidityPeriod,

-  attributes             SEQUENCE OF Attribute,

-  issuerUniqueID         UniqueIdentifier OPTIONAL,

-  extensions             Extensions OPTIONAL

-}

-

-IssuerSerial ::= SEQUENCE {

-  issuer     GeneralNames,

-  serial     CertificateSerialNumber,

-  issuerUID  UniqueIdentifier OPTIONAL

-}

-

-AttCertValidityPeriod ::= SEQUENCE {

-  notBeforeTime  GeneralizedTime,

-  notAfterTime   GeneralizedTime

-}

-

---attributeCertificateMatch MATCHING-RULE ::= {

---  SYNTAX  AttributeCertificateAssertion

---  ID      id-mr-attributeCertificateMatch

---}

-

-AttributeCertificateAssertion ::= SEQUENCE {

-  subject

-    [0]  CHOICE {baseCertificateID  [0]  IssuerSerial,

-                 subjectName        [1]  Name} OPTIONAL,

-  issuer           [1]  Name OPTIONAL,

-  attCertValidity  [2]  GeneralizedTime OPTIONAL,

-  attType          [3]  SET OF AttributeType OPTIONAL

-}

-

---  At least one component of the sequence must be present

---  attribute types 

---userPassword ATTRIBUTE ::= {

---  WITH SYNTAX             OCTET STRING(SIZE (0..ub-user-password))

---  EQUALITY MATCHING RULE  octetStringMatch

---  ID                      id-at-userPassword

---}

-

---userCertificate ATTRIBUTE ::= {

---  WITH SYNTAX             Certificate

---  EQUALITY MATCHING RULE  certificateExactMatch

---  ID                      id-at-userCertificate

---}

-

---cACertificate ATTRIBUTE ::= {

---  WITH SYNTAX             Certificate

---  EQUALITY MATCHING RULE  certificateExactMatch

---  ID                      id-at-cAcertificate

---}

-

---crossCertificatePair ATTRIBUTE ::= {

---  WITH SYNTAX             CertificatePair

---  EQUALITY MATCHING RULE  certificatePairExactMatch

---  ID                      id-at-crossCertificatePair

---}

-

---authorityRevocationList ATTRIBUTE ::= {

---  WITH SYNTAX             CertificateList

---  EQUALITY MATCHING RULE  certificateListExactMatch

---  ID                      id-at-authorityRevocationList

---}

-

---certificateRevocationList ATTRIBUTE ::= {

---  WITH SYNTAX             CertificateList

---  EQUALITY MATCHING RULE  certificateListExactMatch

---  ID                      id-at-certificateRevocationList

---}

-

---attributeCertificateRevocationList ATTRIBUTE ::= {

---  WITH SYNTAX  CertificateList

---  ID           id-at-attributeCertificateRevocationList

---}

-

---  information object classes 

---ALGORITHM ::= TYPE-IDENTIFIER

-

---  object identifier assignments 

---id-at-userPassword OBJECT IDENTIFIER ::=

---  {id-at 35}

-

-id-at-userCertificate OBJECT IDENTIFIER ::= {id-at 36}

-

-id-at-cAcertificate OBJECT IDENTIFIER ::= {id-at 37}

-

-id-at-authorityRevocationList OBJECT IDENTIFIER ::= {id-at 38}

-

-id-at-certificateRevocationList OBJECT IDENTIFIER ::= {id-at 39}

-

-id-at-crossCertificatePair OBJECT IDENTIFIER ::= {id-at 40}

-

-id-at-attributeCertificate OBJECT IDENTIFIER ::= {id-at 58}

-

-id-at-attributeCertificateRevocationList OBJECT IDENTIFIER ::= {id-at 59}

-

---id-mr-attributeCertificateMatch OBJECT IDENTIFIER ::= {id-mr 42}

-

-END

-

--- Generated by Asnp, the ASN.1 pretty-printer of France Telecom R&D

-

+-- Module AuthenticationFramework (X.509:08/1997)
+
+AuthenticationFramework {joint-iso-itu-t ds(5) module(1)
+  authenticationFramework(7) 3} DEFINITIONS ::=
+BEGIN
+
+--  EXPORTS All 
+--  The types and values defined in this module are exported for use in the other ASN.1 modules contained
+--  within the Directory Specifications, and for the use of other applications which will use them to access
+--  Directory services. Other applications may use them for their own purposes, but this will not constrain
+--  extensions and modifications needed to maintain or improve the Directory service.
+IMPORTS
+  id-at, id-mr, informationFramework, upperBounds, selectedAttributeTypes,
+    basicAccessControl, certificateExtensions
+    FROM UsefulDefinitions {joint-iso-itu-t ds(5) module(1)
+      usefulDefinitions(0) 3}
+  Name, ATTRIBUTE, AttributeType, MATCHING-RULE, Attribute
+    FROM InformationFramework informationFramework
+  ub-user-password
+    FROM UpperBounds upperBounds
+  AuthenticationLevel
+    FROM BasicAccessControl basicAccessControl
+  UniqueIdentifier, octetStringMatch
+    FROM SelectedAttributeTypes selectedAttributeTypes
+  certificateExactMatch, certificatePairExactMatch, certificateListExactMatch,
+    GeneralNames
+    FROM CertificateExtensions certificateExtensions;
+
+--  basic certificate definition
+Certificate ::= SEQUENCE {
+  signedCertificate SEQUENCE {
+               version                  [0]  Version DEFAULT v1,
+               serialNumber             CertificateSerialNumber,
+               signature                AlgorithmIdentifier,
+               issuer                   Name,
+               validity                 Validity,
+               subject                  Name,
+               subjectPublicKeyInfo     SubjectPublicKeyInfo,
+               issuerUniqueIdentifier   [1] IMPLICIT UniqueIdentifier OPTIONAL,
+               --  if present, version must be v2 or v3
+               subjectUniqueIdentifier  [2] IMPLICIT UniqueIdentifier OPTIONAL,
+               --  if present, version must be v2 or v3
+               extensions               [3]  Extensions OPTIONAL
+               --  If present, version must be v3 -- },
+  algorithmIdentifier  AlgorithmIdentifier,
+  encrypted            BIT STRING
+}
+
+Version ::= INTEGER {v1(0), v2(1), v3(2)}
+
+CertificateSerialNumber ::= INTEGER
+
+-- Can not be handled by compiler. Handimplemented in the template
+AlgorithmIdentifier ::= SEQUENCE {
+--  algorithm   ALGORITHM.&id({SupportedAlgorithms}),
+--  parameters  ALGORITHM.&Type({SupportedAlgorithms}{@algorithm}) OPTIONAL
+}
+
+--	Definition of the following information object set is deferred, perhaps to standardized
+--	profiles or to protocol implementation conformance statements. The set is required to
+--	specify a table constraint on the parameters component of AlgorithmIdentifier.
+--SupportedAlgorithms ALGORITHM ::=
+--{...}
+
+Validity ::= SEQUENCE {notBefore  Time,
+                       notAfter   Time
+}
+
+SubjectPublicKeyInfo ::= SEQUENCE {
+  algorithm         AlgorithmIdentifier,
+  subjectPublicKey  BIT STRING
+}
+
+Time ::= CHOICE {utcTime          UTCTime,
+                 generalizedTime  GeneralizedTime
+}
+
+Extensions ::= SEQUENCE OF Extension
+
+--  For those extensions where ordering of individual extensions within the SEQUENCE is significant, the
+--  specification of those individual extensions shall include the rules for the significance of the order therein
+-- XXX Implemented by hand in the template
+Extension ::= SEQUENCE {
+--  extnId     EXTENSION.&id({ExtensionSet}),
+--  critical   BOOLEAN DEFAULT FALSE,
+--  extnValue  OCTET STRING
+--    contains a DER encoding of a value of type &ExtnType
+--    for the extension object identified by extnId 
+}
+
+--ExtensionSet EXTENSION ::=
+--  {...}
+
+--EXTENSION ::= CLASS {&id        OBJECT IDENTIFIER UNIQUE,
+--                     &ExtnType  
+--}WITH SYNTAX {SYNTAX &ExtnType
+--              IDENTIFIED BY &id
+--}
+
+--  other certificate constructs
+Certificates ::= SEQUENCE {
+  userCertificate    Certificate,
+  certificationPath  ForwardCertificationPath OPTIONAL
+}
+
+ForwardCertificationPath ::= SEQUENCE OF CrossCertificates
+
+CrossCertificates ::= SET OF Certificate
+
+CertificationPath ::= SEQUENCE {
+  userCertificate    Certificate,
+  theCACertificates  SEQUENCE OF CertificatePair OPTIONAL
+}
+
+CertificatePair ::= SEQUENCE {
+  issuedByThisCA  [0]  Certificate OPTIONAL,
+  issuedToThisCA  [1]  Certificate OPTIONAL
+  --  at least one of the pair shall be present 
+}
+
+--  Certificate Revocation List (CRL)
+CertificateList ::= SEQUENCE {
+    signedCertificateList SEQUENCE {
+               version              Version OPTIONAL,
+               --  if present, version must be v2
+               signature            AlgorithmIdentifier,
+               issuer               Name,
+               thisUpdate           Time,
+               nextUpdate           Time OPTIONAL,
+               revokedCertificates
+                 SEQUENCE OF
+                   SEQUENCE {userCertificate     CertificateSerialNumber,
+                             revocationDate      Time,
+                             crlEntryExtensions  Extensions OPTIONAL} OPTIONAL,
+               crlExtensions        [0]  Extensions OPTIONAL},
+  algorithmIdentifier  AlgorithmIdentifier,
+  encrypted            BIT STRING
+}
+
+--  attribute certificate
+AttributeCertificationPath ::= SEQUENCE {
+  attributeCertificate  AttributeCertificate,
+  acPath                SEQUENCE OF ACPathData OPTIONAL
+}
+
+ACPathData ::= SEQUENCE {
+  certificate           [0]  Certificate OPTIONAL,
+  attributeCertificate  [1]  AttributeCertificate OPTIONAL
+}
+
+--attributeCertificate ATTRIBUTE ::= {
+--  WITH SYNTAX             AttributeCertificate
+--  EQUALITY MATCHING RULE  attributeCertificateMatch
+--  ID                      id-at-attributeCertificate
+--}
+
+AttributeCertificate ::= SEQUENCE {
+  signedAttributeCertificateInfo AttributeCertificateInfo,
+  algorithmIdentifier  AlgorithmIdentifier,
+  encrypted            BIT STRING
+}
+
+AttributeCertificateInfo ::= SEQUENCE {
+  version                Version DEFAULT v1,
+  subject
+    CHOICE {baseCertificateID  [0]  IssuerSerial,
+            subjectName        [1]  GeneralNames
+           },
+  issuer                 GeneralNames,
+  signature              AlgorithmIdentifier,
+  serialNumber           CertificateSerialNumber,
+  attCertValidityPeriod  AttCertValidityPeriod,
+  attributes             SEQUENCE OF Attribute,
+  issuerUniqueID         UniqueIdentifier OPTIONAL,
+  extensions             Extensions OPTIONAL
+}
+
+IssuerSerial ::= SEQUENCE {
+  issuer     GeneralNames,
+  serial     CertificateSerialNumber,
+  issuerUID  UniqueIdentifier OPTIONAL
+}
+
+AttCertValidityPeriod ::= SEQUENCE {
+  notBeforeTime  GeneralizedTime,
+  notAfterTime   GeneralizedTime
+}
+
+--attributeCertificateMatch MATCHING-RULE ::= {
+--  SYNTAX  AttributeCertificateAssertion
+--  ID      id-mr-attributeCertificateMatch
+--}
+
+AttributeCertificateAssertion ::= SEQUENCE {
+  subject
+    [0]  CHOICE {baseCertificateID  [0]  IssuerSerial,
+                 subjectName        [1]  Name} OPTIONAL,
+  issuer           [1]  Name OPTIONAL,
+  attCertValidity  [2]  GeneralizedTime OPTIONAL,
+  attType          [3]  SET OF AttributeType OPTIONAL
+}
+
+--  At least one component of the sequence must be present
+--  attribute types 
+--userPassword ATTRIBUTE ::= {
+--  WITH SYNTAX             OCTET STRING(SIZE (0..ub-user-password))
+--  EQUALITY MATCHING RULE  octetStringMatch
+--  ID                      id-at-userPassword
+--}
+
+--userCertificate ATTRIBUTE ::= {
+--  WITH SYNTAX             Certificate
+--  EQUALITY MATCHING RULE  certificateExactMatch
+--  ID                      id-at-userCertificate
+--}
+
+--cACertificate ATTRIBUTE ::= {
+--  WITH SYNTAX             Certificate
+--  EQUALITY MATCHING RULE  certificateExactMatch
+--  ID                      id-at-cAcertificate
+--}
+
+--crossCertificatePair ATTRIBUTE ::= {
+--  WITH SYNTAX             CertificatePair
+--  EQUALITY MATCHING RULE  certificatePairExactMatch
+--  ID                      id-at-crossCertificatePair
+--}
+
+--authorityRevocationList ATTRIBUTE ::= {
+--  WITH SYNTAX             CertificateList
+--  EQUALITY MATCHING RULE  certificateListExactMatch
+--  ID                      id-at-authorityRevocationList
+--}
+
+--certificateRevocationList ATTRIBUTE ::= {
+--  WITH SYNTAX             CertificateList
+--  EQUALITY MATCHING RULE  certificateListExactMatch
+--  ID                      id-at-certificateRevocationList
+--}
+
+--attributeCertificateRevocationList ATTRIBUTE ::= {
+--  WITH SYNTAX  CertificateList
+--  ID           id-at-attributeCertificateRevocationList
+--}
+
+--  information object classes 
+--ALGORITHM ::= TYPE-IDENTIFIER
+
+--  object identifier assignments 
+--id-at-userPassword OBJECT IDENTIFIER ::=
+--  {id-at 35}
+
+id-at-userCertificate OBJECT IDENTIFIER ::= {id-at 36}
+
+id-at-cAcertificate OBJECT IDENTIFIER ::= {id-at 37}
+
+id-at-authorityRevocationList OBJECT IDENTIFIER ::= {id-at 38}
+
+id-at-certificateRevocationList OBJECT IDENTIFIER ::= {id-at 39}
+
+id-at-crossCertificatePair OBJECT IDENTIFIER ::= {id-at 40}
+
+id-at-attributeCertificate OBJECT IDENTIFIER ::= {id-at 58}
+
+id-at-attributeCertificateRevocationList OBJECT IDENTIFIER ::= {id-at 59}
+
+--id-mr-attributeCertificateMatch OBJECT IDENTIFIER ::= {id-mr 42}
+
+END
+
+-- Generated by Asnp, the ASN.1 pretty-printer of France Telecom R&D
+
diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index cbd0a6e796..99ca9d925f 100644
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -1,7 +1,7 @@
 /* packet-x509af.c
  * Routines for X.509 Authentication Framework packet dissection
  *
- * $Id: packet-x509af-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/x509af/packet-x509af-template.h b/asn1/x509af/packet-x509af-template.h
index 52ec3c91ea..ded2f56339 100644
--- a/asn1/x509af/packet-x509af-template.h
+++ b/asn1/x509af/packet-x509af-template.h
@@ -1,7 +1,7 @@
 /* packet-x509af.h
  * Routines for X.509 Authentication Framework packet dissection
  *
- * $Id: packet-x509af-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index cdcd199a92..1a1edc0a79 100644
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -1,53 +1,53 @@
-# x509.cnf

-# X509 conformation file

-

-# $Id: x509.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $

-

-#.MODULE_IMPORT

-InformationFramework x509if

-CertificateExtensions x509ce

-SelectedAttributeTypes x509sat

-

-#.INCLUDE ../x509ce/x509ce_exp.cnf

-#.INCLUDE ../x509if/x509if_exp.cnf

-#.INCLUDE ../x509sat/x509sat_exp.cnf

-

-#.EXPORTS

-

-AttributeCertificate

-AttributeCertificateAssertion

-AttributeCertificationPath

-Certificate

-Certificates

-CertificateList

-CertificateSerialNumber

-CertificationPath

-SubjectPublicKeyInfo

-

-#.PDU

-AttributeCertificate

-Certificate

-CertificateList

-CertificatePair

-

-#.NO_EMIT

-

-AlgorithmIdentifier

-Extension

-

-#.TYPE_RENAME

-AttributeCertificateInfo/subject	InfoSubject

-AttributeCertificateAssertion/subject	AssertionSubject

-

-#.FIELD_RENAME

-AttributeCertificateInfo/subject info_subject

-AttributeCertificateAssertion/subject assertion_subject

-

-AttributeCertificateAssertion/issuer assertionIssuer

-

-AttributeCertificateInfo/subject/subjectName      infoSubjectName

-AttributeCertificateAssertion/subject/subjectName assertionSubjectName

-

-#.END

-

-

+# x509.cnf
+# X509 conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+InformationFramework x509if
+CertificateExtensions x509ce
+SelectedAttributeTypes x509sat
+
+#.INCLUDE ../x509ce/x509ce_exp.cnf
+#.INCLUDE ../x509if/x509if_exp.cnf
+#.INCLUDE ../x509sat/x509sat_exp.cnf
+
+#.EXPORTS
+
+AttributeCertificate
+AttributeCertificateAssertion
+AttributeCertificationPath
+Certificate
+Certificates
+CertificateList
+CertificateSerialNumber
+CertificationPath
+SubjectPublicKeyInfo
+
+#.PDU
+AttributeCertificate
+Certificate
+CertificateList
+CertificatePair
+
+#.NO_EMIT
+
+AlgorithmIdentifier
+Extension
+
+#.TYPE_RENAME
+AttributeCertificateInfo/subject	InfoSubject
+AttributeCertificateAssertion/subject	AssertionSubject
+
+#.FIELD_RENAME
+AttributeCertificateInfo/subject info_subject
+AttributeCertificateAssertion/subject assertion_subject
+
+AttributeCertificateAssertion/issuer assertionIssuer
+
+AttributeCertificateInfo/subject/subjectName      infoSubjectName
+AttributeCertificateAssertion/subject/subjectName assertionSubjectName
+
+#.END
+
+
diff --git a/asn1/x509af/x509af_exp.cnf b/asn1/x509af/x509af_exp.cnf
index 0368d58dc3..690fb20117 100644
--- a/asn1/x509af/x509af_exp.cnf
+++ b/asn1/x509af/x509af_exp.cnf
@@ -1,25 +1,25 @@
-

-#.IMPORT_TAG

-AlgorithmIdentifier BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-AttributeCertificate     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-AttributeCertificateAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-AttributeCertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-Certificate              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-CertificateSerialNumber  BER_CLASS_UNI BER_UNI_TAG_INTEGER

-Certificates             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-CertificationPath        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-CertificateList          BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-SubjectPublicKeyInfo     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-#.END

-

-#.TYPE_ATTR

-Certificate              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0

-CertificateSerialNumber  TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0

-Certificates             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0

-CertificationPath        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0

-CertificateList          TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0

-AttributeCertificationPath TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0

-AttributeCertificate     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0

-AttributeCertificateAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0

-SubjectPublicKeyInfo     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0

-#.END

+
+#.IMPORT_TAG
+AlgorithmIdentifier BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+AttributeCertificate     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+AttributeCertificateAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+AttributeCertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+Certificate              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CertificateSerialNumber  BER_CLASS_UNI BER_UNI_TAG_INTEGER
+Certificates             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CertificationPath        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CertificateList          BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+SubjectPublicKeyInfo     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+#.END
+
+#.TYPE_ATTR
+Certificate              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CertificateSerialNumber  TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+Certificates             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CertificationPath        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CertificateList          TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+AttributeCertificationPath TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+AttributeCertificate     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+AttributeCertificateAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+SubjectPublicKeyInfo     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+#.END