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

40 files changed, 682 insertions, 682 deletions

diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf
index cd01fc1170..c5e2c61407 100644
--- a/asn1/cms/cms.cnf
+++ b/asn1/cms/cms.cnf
@@ -1,27 +1,27 @@
-# CMS.cnf

-# CMS conformation file

-

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

-

-#.MODULE_IMPORT

-AuthenticationFramework x509af

-InformationFramework x509if

-

-#.INCLUDE ../x509af/x509af_exp.cnf

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

-

-#.EXPORTS

-SignedData

-Countersignature

-IssuerAndSerialNumber

-

-#.NO_EMIT

-OtherKeyAttribute

-

-#.TYPE_RENAME

-

-#.FIELD_RENAME

-

-#.END

-

-

+# CMS.cnf
+# CMS conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+AuthenticationFramework x509af
+InformationFramework x509if
+
+#.INCLUDE ../x509af/x509af_exp.cnf
+#.INCLUDE ../x509if/x509if_exp.cnf
+
+#.EXPORTS
+SignedData
+Countersignature
+IssuerAndSerialNumber
+
+#.NO_EMIT
+OtherKeyAttribute
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
+
diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c
index bbb517b6bf..33cd901af9 100644
--- a/asn1/cms/packet-cms-template.c
+++ b/asn1/cms/packet-cms-template.c
@@ -1,7 +1,7 @@
 /* packet-cms.c
  * Routines for RFC2630 Cryptographic Message Syntax packet dissection
  *
- * $Id: packet-cms-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/cms/packet-cms-template.h b/asn1/cms/packet-cms-template.h
index e44775a9b6..37898db9c0 100644
--- a/asn1/cms/packet-cms-template.h
+++ b/asn1/cms/packet-cms-template.h
@@ -1,7 +1,7 @@
 /* packet-cms.h
  * Routines for RFC2630 Cryptographic Message Syntax packet dissection
  *
- * $Id: packet-cms-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/h248/h248.cnf b/asn1/h248/h248.cnf
index 23b79e5556..0039130e25 100644
--- a/asn1/h248/h248.cnf
+++ b/asn1/h248/h248.cnf
@@ -1,22 +1,22 @@
-# ih248.cnf

-# H.248 conformation file

-

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

-

-#.MODULE_IMPORT

-

-#.EXPORTS

-

-#.PDU

-

-#.NO_EMIT

-MtpAddress

-PkgdName

-

-#.TYPE_RENAME

-

-#.FIELD_RENAME

-

-#.END

-

-

+# ih248.cnf
+# H.248 conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+
+#.EXPORTS
+
+#.PDU
+
+#.NO_EMIT
+MtpAddress
+PkgdName
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
+
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index 7fb911cf03..7b30fb5656 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -2,7 +2,7 @@
  * Routines for H.248/MEGACO packet dissection
  * Ronnie Sahlberg 2004
  *
- * $Id: packet-h248-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/h248/packet-h248-template.h b/asn1/h248/packet-h248-template.h
index 546f911f06..a70b7fa14a 100644
--- a/asn1/h248/packet-h248-template.h
+++ b/asn1/h248/packet-h248-template.h
@@ -2,7 +2,7 @@
  * Routines for H.248/MEGACO packet dissection
  * Ronnie Sahlberg 2004
  *
- * $Id: packet-h248-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/ns-cert-exts/ns_cert_exts.cnf b/asn1/ns-cert-exts/ns_cert_exts.cnf
index 8c35f27c16..c3a227657d 100644
--- a/asn1/ns-cert-exts/ns_cert_exts.cnf
+++ b/asn1/ns-cert-exts/ns_cert_exts.cnf
@@ -1,28 +1,28 @@
-# NS-CERT-EXT.cnf

-# NetScape Certificate Extensions conformation file

-

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

-

-#.MODULE_IMPORT

-

-#.EXPORTS

-

-#.PDU

-BaseUrl

-CaPolicyUrl

-CaRevocationUrl

-CertRenewalUrl

-CertType

-Comment

-RevocationUrl

-SslServerName

-

-#.NO_EMIT

-

-#.TYPE_RENAME

-

-#.FIELD_RENAME

-

-#.END

-

-

+# NS-CERT-EXT.cnf
+# NetScape Certificate Extensions conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+
+#.EXPORTS
+
+#.PDU
+BaseUrl
+CaPolicyUrl
+CaRevocationUrl
+CertRenewalUrl
+CertType
+Comment
+RevocationUrl
+SslServerName
+
+#.NO_EMIT
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
+
diff --git a/asn1/ns-cert-exts/packet-ns_cert_exts-template.c b/asn1/ns-cert-exts/packet-ns_cert_exts-template.c
index 6ab6c4e082..f937c2a6d0 100644
--- a/asn1/ns-cert-exts/packet-ns_cert_exts-template.c
+++ b/asn1/ns-cert-exts/packet-ns_cert_exts-template.c
@@ -1,7 +1,7 @@
 /* packet-ns_cert_exts.c
  * Routines for NetScape Certificate Extensions packet dissection
  *
- * $Id: packet-ns_cert_exts-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/ns-cert-exts/packet-ns_cert_exts-template.h b/asn1/ns-cert-exts/packet-ns_cert_exts-template.h
index 8a72c72fff..fdbd43db25 100644
--- a/asn1/ns-cert-exts/packet-ns_cert_exts-template.h
+++ b/asn1/ns-cert-exts/packet-ns_cert_exts-template.h
@@ -1,7 +1,7 @@
 /* packet-ns-cert-exts.h
  * Routines for NetScape Certificate Extensions packet dissection
  *
- * $Id: packet-cms-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/pkcs1/packet-pkcs1-template.c b/asn1/pkcs1/packet-pkcs1-template.c
index ee97f5d988..7445376f1e 100644
--- a/asn1/pkcs1/packet-pkcs1-template.c
+++ b/asn1/pkcs1/packet-pkcs1-template.c
@@ -1,7 +1,7 @@
 /* packet-pkcs1.c
  * Routines for PKCS#1/RFC2313 packet dissection
  *
- * $Id: packet-pkcs1-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/pkcs1/packet-pkcs1-template.h b/asn1/pkcs1/packet-pkcs1-template.h
index 50201f11d4..8facce40b4 100644
--- a/asn1/pkcs1/packet-pkcs1-template.h
+++ b/asn1/pkcs1/packet-pkcs1-template.h
@@ -1,7 +1,7 @@
 /* packet-pkcs1.h
  * Routines for PKCS#1/RFC2313 packet dissection
  *
- * $Id: packet-pkcs1-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/pkcs1/pkcs1.cnf b/asn1/pkcs1/pkcs1.cnf
index 76b5acd95f..a94b0e603d 100644
--- a/asn1/pkcs1/pkcs1.cnf
+++ b/asn1/pkcs1/pkcs1.cnf
@@ -1,25 +1,25 @@
-# pkcs1.cnf

-# PKCS#1 conformation file

-

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

-

-#.MODULE_IMPORT

-AuthenticationFramework x509af

-

-#.INCLUDE ../x509af/x509af_exp.cnf

-

-#.EXPORTS

-

-RSAPrivateKey

-RSAPublicKey

-DigestInfo

-

-#.NO_EMIT

-

-#.TYPE_RENAME

-

-#.FIELD_RENAME

-

-#.END

-

-

+# pkcs1.cnf
+# PKCS#1 conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+AuthenticationFramework x509af
+
+#.INCLUDE ../x509af/x509af_exp.cnf
+
+#.EXPORTS
+
+RSAPrivateKey
+RSAPublicKey
+DigestInfo
+
+#.NO_EMIT
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
+
diff --git a/asn1/pkinit/packet-pkinit-template.c b/asn1/pkinit/packet-pkinit-template.c
index 69e205d9e1..2dd03e6e09 100644
--- a/asn1/pkinit/packet-pkinit-template.c
+++ b/asn1/pkinit/packet-pkinit-template.c
@@ -1,7 +1,7 @@
 /* packet-pkinit.c
  * Routines for PKINIT packet dissection
  *
- * $Id: packet-pkinit-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/pkinit/packet-pkinit-template.h b/asn1/pkinit/packet-pkinit-template.h
index 359982e91c..7f9e78edeb 100644
--- a/asn1/pkinit/packet-pkinit-template.h
+++ b/asn1/pkinit/packet-pkinit-template.h
@@ -1,7 +1,7 @@
 /* packet-pkinit.h
  * Routines for PKINIT packet dissection
  *
- * $Id: packet-pkinit-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/pkinit/pkinit.cnf b/asn1/pkinit/pkinit.cnf
index 104f27cd78..6fc1ad5536 100644
--- a/asn1/pkinit/pkinit.cnf
+++ b/asn1/pkinit/pkinit.cnf
@@ -1,24 +1,24 @@
-# pkinit.cnf

-# pkinit conformation file

-

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

-

-#.MODULE_IMPORT

-PKIX1Explicit88              pkix1explicit

-CryptographicMessageSyntax   cms

-

-#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf

-#.INCLUDE ../cms/cms_exp.cnf

-

-#.EXPORTS

-

-#.PDU

-

-#.NO_EMIT

-

-#.TYPE_RENAME

-

-#.FIELD_RENAME

-

-#.END

-

+# pkinit.cnf
+# pkinit conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+PKIX1Explicit88              pkix1explicit
+CryptographicMessageSyntax   cms
+
+#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
+#.INCLUDE ../cms/cms_exp.cnf
+
+#.EXPORTS
+
+#.PDU
+
+#.NO_EMIT
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
diff --git a/asn1/pkinit/pkinit_exp.cnf b/asn1/pkinit/pkinit_exp.cnf
index 2d9c452df6..27149af322 100644
--- a/asn1/pkinit/pkinit_exp.cnf
+++ b/asn1/pkinit/pkinit_exp.cnf
@@ -1,6 +1,6 @@
-

-#.IMPORT_TAG

-#.END

-

-#.TYPE_ATTR

-#.END

+
+#.IMPORT_TAG
+#.END
+
+#.TYPE_ATTR
+#.END
diff --git a/asn1/pkix1explicit/packet-pkix1explicit-template.c b/asn1/pkix1explicit/packet-pkix1explicit-template.c
index 64d323a033..2f41512d92 100644
--- a/asn1/pkix1explicit/packet-pkix1explicit-template.c
+++ b/asn1/pkix1explicit/packet-pkix1explicit-template.c
@@ -3,7 +3,7 @@
 /* packet-pkix1explicit.c
  * Routines for PKIX1Explitic packet dissection
  *
- * $Id: packet-pkix1explicit-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/pkix1explicit/packet-pkix1explicit-template.h b/asn1/pkix1explicit/packet-pkix1explicit-template.h
index 0a385168b4..798ce7f066 100644
--- a/asn1/pkix1explicit/packet-pkix1explicit-template.h
+++ b/asn1/pkix1explicit/packet-pkix1explicit-template.h
@@ -1,7 +1,7 @@
 /* packet-pkix1explicit.h
  * Routines for PKIX1Explicit packet dissection
  *
- * $Id: packet-pkix1explicit-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/pkix1explicit/pkix1explicit.cnf b/asn1/pkix1explicit/pkix1explicit.cnf
index 68222450d3..16f9d633d3 100644
--- a/asn1/pkix1explicit/pkix1explicit.cnf
+++ b/asn1/pkix1explicit/pkix1explicit.cnf
@@ -1,24 +1,24 @@
-# pkix1explicit.cnf

-# pkix1explicit conformation file

-

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

-

-#.MODULE_IMPORT

-

-#.EXPORTS

-

-TeletexDomainDefinedAttribute

-TerminalType

-

-#.PDU

-

-#.NO_EMIT

-

-CertificateSerialNumber

-

-#.TYPE_RENAME

-

-#.FIELD_RENAME

-

-#.END

-

+# pkix1explicit.cnf
+# pkix1explicit conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+
+#.EXPORTS
+
+TeletexDomainDefinedAttribute
+TerminalType
+
+#.PDU
+
+#.NO_EMIT
+
+CertificateSerialNumber
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
diff --git a/asn1/pkix1explicit/pkix1explicit_exp.cnf b/asn1/pkix1explicit/pkix1explicit_exp.cnf
index 32c46a31f6..e7919fa143 100644
--- a/asn1/pkix1explicit/pkix1explicit_exp.cnf
+++ b/asn1/pkix1explicit/pkix1explicit_exp.cnf
@@ -1,19 +1,19 @@
-

-#.IMPORT_TAG

-AlgorithmIdentifier      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-CertificateSerialNumber  BER_CLASS_UNI BER_UNI_TAG_INTEGER

-Name                     BER_CLASS_ANY -1

-SubjectPublicKeyInfo     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-TeletexDomainDefinedAttribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-TerminalType             BER_CLASS_UNI BER_UNI_TAG_INTEGER

-#.END

-

-#.TYPE_ATTR

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

-Name                     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0

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

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

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

-#.END

-

-

+
+#.IMPORT_TAG
+AlgorithmIdentifier      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CertificateSerialNumber  BER_CLASS_UNI BER_UNI_TAG_INTEGER
+Name                     BER_CLASS_ANY -1
+SubjectPublicKeyInfo     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+TeletexDomainDefinedAttribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+TerminalType             BER_CLASS_UNI BER_UNI_TAG_INTEGER
+#.END
+
+#.TYPE_ATTR
+CertificateSerialNumber  TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+Name                     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+SubjectPublicKeyInfo     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+TeletexDomainDefinedAttribute TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+TerminalType             TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+#.END
+
+
diff --git a/asn1/pkix1implicit/packet-pkix1implicit-template.c b/asn1/pkix1implicit/packet-pkix1implicit-template.c
index bd4f530b91..27adda871c 100644
--- a/asn1/pkix1implicit/packet-pkix1implicit-template.c
+++ b/asn1/pkix1implicit/packet-pkix1implicit-template.c
@@ -1,7 +1,7 @@
 /* packet-pkix1implicit.c
  * Routines for PKIX1Implitic packet dissection
  *
- * $Id: packet-pkix1implicit-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/pkix1implicit/packet-pkix1implicit-template.h b/asn1/pkix1implicit/packet-pkix1implicit-template.h
index e2977fdac3..12b712b5bc 100644
--- a/asn1/pkix1implicit/packet-pkix1implicit-template.h
+++ b/asn1/pkix1implicit/packet-pkix1implicit-template.h
@@ -1,7 +1,7 @@
 /* packet-pkix1implicit.h
  * Routines for PKIX1Implicit packet dissection
  *
- * $Id: packet-pkix1implicit-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/pkix1implicit/pkix1implicit.cnf b/asn1/pkix1implicit/pkix1implicit.cnf
index c2796db0e7..13e37b4ed5 100644
--- a/asn1/pkix1implicit/pkix1implicit.cnf
+++ b/asn1/pkix1implicit/pkix1implicit.cnf
@@ -1,21 +1,21 @@
-# pkix1implicit.cnf

-# pkix1implicit conformation file

-

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

-

-#.MODULE_IMPORT

-

-#.EXPORTS

-

-UserNotice

-

-#.PDU

-

-#.NO_EMIT

-

-#.TYPE_RENAME

-

-#.FIELD_RENAME

-

-#.END

-

+# pkix1implicit.cnf
+# pkix1implicit conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+
+#.EXPORTS
+
+UserNotice
+
+#.PDU
+
+#.NO_EMIT
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
diff --git a/asn1/pkix1implicit/pkix1implicit_exp.cnf b/asn1/pkix1implicit/pkix1implicit_exp.cnf
index e6c217ec90..3c0a87cf39 100644
--- a/asn1/pkix1implicit/pkix1implicit_exp.cnf
+++ b/asn1/pkix1implicit/pkix1implicit_exp.cnf
@@ -1,8 +1,8 @@
-

-#.IMPORT_TAG

-UserNotice               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-#.END

-

-#.TYPE_ATTR

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

-#.END

+
+#.IMPORT_TAG
+UserNotice               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+#.END
+
+#.TYPE_ATTR
+UserNotice               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+#.END
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
diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c
index 4eac248101..5f8c717489 100644
--- a/asn1/x509ce/packet-x509ce-template.c
+++ b/asn1/x509ce/packet-x509ce-template.c
@@ -1,7 +1,7 @@
 /* packet-x509ce.c
  * Routines for X.509 Certificate Extensions packet dissection
  *
- * $Id: packet-x509ce-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/x509ce/packet-x509ce-template.h b/asn1/x509ce/packet-x509ce-template.h
index 92acac5a58..f88f4ee741 100644
--- a/asn1/x509ce/packet-x509ce-template.h
+++ b/asn1/x509ce/packet-x509ce-template.h
@@ -1,7 +1,7 @@
 /* packet-x509ce.h
  * Routines for X.509 Certificate Extensions packet dissection
  *
- * $Id: packet-x509ce-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/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf
index f393a58104..5baaf95ed7 100644
--- a/asn1/x509ce/x509ce.cnf
+++ b/asn1/x509ce/x509ce.cnf
@@ -1,53 +1,53 @@
-# x509ce.cnf

-# X509CE conformation file

-

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

-

-#.MODULE_IMPORT

-InformationFramework x509if

-AuthenticationFramework x509af

-SelectedAttributeTypes x509sat

-

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

-#.INCLUDE ../x509af/x509af_exp.cnf

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

-

-#.EXPORTS

-

-GeneralNames

-

-#.PDU

-AttributesSyntax

-AuthorityKeyIdentifier

-BaseCRLNumber

-BasicConstraintsSyntax

-CertificatePoliciesSyntax

-CRLDistPointsSyntax

-CRLNumber

-CRLReason

-CRLScopeSyntax

-CRLStreamIdentifier

-DeltaInformation

-GeneralNames

-HoldInstruction

-IssuingDistPointSyntax

-KeyPurposeIDs

-KeyUsage

-NameConstraintsSyntax

-OrderedListSyntax

-PolicyConstraintsSyntax

-PolicyMappingsSyntax

-PrivateKeyUsagePeriod

-SkipCerts

-StatusReferrals

-SubjectKeyIdentifier

-

-#.NO_EMIT

-

-#.TYPE_RENAME

-

-#.FIELD_RENAME

-

-#.END

-

-

+# x509ce.cnf
+# X509CE conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+InformationFramework x509if
+AuthenticationFramework x509af
+SelectedAttributeTypes x509sat
+
+#.INCLUDE ../x509if/x509if_exp.cnf
+#.INCLUDE ../x509af/x509af_exp.cnf
+#.INCLUDE ../x509sat/x509sat_exp.cnf
+
+#.EXPORTS
+
+GeneralNames
+
+#.PDU
+AttributesSyntax
+AuthorityKeyIdentifier
+BaseCRLNumber
+BasicConstraintsSyntax
+CertificatePoliciesSyntax
+CRLDistPointsSyntax
+CRLNumber
+CRLReason
+CRLScopeSyntax
+CRLStreamIdentifier
+DeltaInformation
+GeneralNames
+HoldInstruction
+IssuingDistPointSyntax
+KeyPurposeIDs
+KeyUsage
+NameConstraintsSyntax
+OrderedListSyntax
+PolicyConstraintsSyntax
+PolicyMappingsSyntax
+PrivateKeyUsagePeriod
+SkipCerts
+StatusReferrals
+SubjectKeyIdentifier
+
+#.NO_EMIT
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
+
diff --git a/asn1/x509ce/x509ce_exp.cnf b/asn1/x509ce/x509ce_exp.cnf
index 59efe2a579..32759fde3b 100644
--- a/asn1/x509ce/x509ce_exp.cnf
+++ b/asn1/x509ce/x509ce_exp.cnf
@@ -1,4 +1,4 @@
-

-#.IMPORT_TAG

-GeneralNames     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

-

+
+#.IMPORT_TAG
+GeneralNames     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+
diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c
index ad72e71737..768c119b26 100644
--- a/asn1/x509if/packet-x509if-template.c
+++ b/asn1/x509if/packet-x509if-template.c
@@ -1,7 +1,7 @@
 /* packet-x509if.c
  * Routines for X.509 Information Framework packet dissection
  *
- * $Id: packet-x509if-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/x509if/packet-x509if-template.h b/asn1/x509if/packet-x509if-template.h
index 3ec1866b2a..a26f815ce8 100644
--- a/asn1/x509if/packet-x509if-template.h
+++ b/asn1/x509if/packet-x509if-template.h
@@ -1,7 +1,7 @@
 /* packet-x509if.h
  * Routines for X.509 Information Framework packet dissection
  *
- * $Id: packet-x509if-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/x509if/x509if.cnf b/asn1/x509if/x509if.cnf
index 953113810e..6569ccfbb7 100644
--- a/asn1/x509if/x509if.cnf
+++ b/asn1/x509if/x509if.cnf
@@ -1,24 +1,24 @@
-# x509if.cnf

-# X509IF conformation file

-

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

-

-#.MODULE_IMPORT

-

-#.EXPORTS

-

-AttributeType

-Name

-RelativeDistinguishedName

-

-#.NO_EMIT

-

-AttributeTypeAndDistinguishedValue

-

-#.TYPE_RENAME

-

-#.FIELD_RENAME

-

-#.END

-

-

+# x509if.cnf
+# X509IF conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+
+#.EXPORTS
+
+AttributeType
+Name
+RelativeDistinguishedName
+
+#.NO_EMIT
+
+AttributeTypeAndDistinguishedValue
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
+
diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c
index fd68d6daf1..1f983b5aba 100644
--- a/asn1/x509sat/packet-x509sat-template.c
+++ b/asn1/x509sat/packet-x509sat-template.c
@@ -1,7 +1,7 @@
 /* packet-x509sat.c
  * Routines for X.509 Selected Attribute Types packet dissection
  *
- * $Id: packet-x509sat-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/x509sat/packet-x509sat-template.h b/asn1/x509sat/packet-x509sat-template.h
index 8b820c485c..ecde979f63 100644
--- a/asn1/x509sat/packet-x509sat-template.h
+++ b/asn1/x509sat/packet-x509sat-template.h
@@ -1,7 +1,7 @@
 /* packet-x509sat.h
  * Routines for X.509 Selected Attribute Types packet dissection
  *
- * $Id: packet-x509sat-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/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf
index bd72ba8c3f..d611ce1ada 100644
--- a/asn1/x509sat/x509sat.cnf
+++ b/asn1/x509sat/x509sat.cnf
@@ -1,21 +1,21 @@
-# x509sat.cnf

-# X509SAT conformation file

-

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

-

-#.MODULE_IMPORT

-InformationFramework x509if

-

-#.EXPORTS

-

-UniqueIdentifier

-

-#.NO_EMIT

-

-#.TYPE_RENAME

-

-#.FIELD_RENAME

-

-#.END

-

-

+# x509sat.cnf
+# X509SAT conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+InformationFramework x509if
+
+#.EXPORTS
+
+UniqueIdentifier
+
+#.NO_EMIT
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
+
diff --git a/asn1/x509sat/x509sat_exp.cnf b/asn1/x509sat/x509sat_exp.cnf
index e091fddeff..426e88f57f 100644
--- a/asn1/x509sat/x509sat_exp.cnf
+++ b/asn1/x509sat/x509sat_exp.cnf
@@ -1,4 +1,4 @@
-

-#.IMPORT_TAG

-UniqueIdentifier BER_CLASS_UNI BER_UNI_TAG_BITSTRING

-DirectoryString  BER_CLASS_UNI BER_UNI_TAG_CHOICE

+
+#.IMPORT_TAG
+UniqueIdentifier BER_CLASS_UNI BER_UNI_TAG_BITSTRING
+DirectoryString  BER_CLASS_UNI BER_UNI_TAG_CHOICE