Set svn:keywords to Id to expand RCS IDs, and set svn:eol-style to
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 5 Oct 2004 09:18:55 +0000 (09:18 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 5 Oct 2004 09:18:55 +0000 (09:18 +0000)
native to canonicalize line endings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12203 f5534014-38df-0310-8fa8-9805f1628bb7

40 files changed:
asn1/cms/cms.cnf
asn1/cms/packet-cms-template.c
asn1/cms/packet-cms-template.h
asn1/h248/h248.cnf
asn1/h248/packet-h248-template.c
asn1/h248/packet-h248-template.h
asn1/ns-cert-exts/ns_cert_exts.cnf
asn1/ns-cert-exts/packet-ns_cert_exts-template.c
asn1/ns-cert-exts/packet-ns_cert_exts-template.h
asn1/pkcs1/packet-pkcs1-template.c
asn1/pkcs1/packet-pkcs1-template.h
asn1/pkcs1/pkcs1.cnf
asn1/pkinit/packet-pkinit-template.c
asn1/pkinit/packet-pkinit-template.h
asn1/pkinit/pkinit.cnf
asn1/pkinit/pkinit_exp.cnf
asn1/pkix1explicit/packet-pkix1explicit-template.c
asn1/pkix1explicit/packet-pkix1explicit-template.h
asn1/pkix1explicit/pkix1explicit.cnf
asn1/pkix1explicit/pkix1explicit_exp.cnf
asn1/pkix1implicit/packet-pkix1implicit-template.c
asn1/pkix1implicit/packet-pkix1implicit-template.h
asn1/pkix1implicit/pkix1implicit.cnf
asn1/pkix1implicit/pkix1implicit_exp.cnf
asn1/x509af/AuthenticationFramework.asn
asn1/x509af/packet-x509af-template.c
asn1/x509af/packet-x509af-template.h
asn1/x509af/x509af.cnf
asn1/x509af/x509af_exp.cnf
asn1/x509ce/packet-x509ce-template.c
asn1/x509ce/packet-x509ce-template.h
asn1/x509ce/x509ce.cnf
asn1/x509ce/x509ce_exp.cnf
asn1/x509if/packet-x509if-template.c
asn1/x509if/packet-x509if-template.h
asn1/x509if/x509if.cnf
asn1/x509sat/packet-x509sat-template.c
asn1/x509sat/packet-x509sat-template.h
asn1/x509sat/x509sat.cnf
asn1/x509sat/x509sat_exp.cnf

index cd01fc117070b83ea20ff45300d1f2f152b95031..c5e2c614076ba3fda59ada2407bb697b574567cd 100644 (file)
@@ -1,27 +1,27 @@
-# CMS.cnf\r
-# CMS conformation file\r
-\r
-# $Id: cms.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $\r
-\r
-#.MODULE_IMPORT\r
-AuthenticationFramework x509af\r
-InformationFramework x509if\r
-\r
-#.INCLUDE ../x509af/x509af_exp.cnf\r
-#.INCLUDE ../x509if/x509if_exp.cnf\r
-\r
-#.EXPORTS\r
-SignedData\r
-Countersignature\r
-IssuerAndSerialNumber\r
-\r
-#.NO_EMIT\r
-OtherKeyAttribute\r
-\r
-#.TYPE_RENAME\r
-\r
-#.FIELD_RENAME\r
-\r
-#.END\r
-\r
-\r
+# 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
+
+
index bbb517b6bf111d1e2613f0cad99b2b11cf69ebe2..33cd901af925889a385550da23fb2213e634c3c9 100644 (file)
@@ -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>
index e44775a9b6927c099cb7abfb7ab796b6aed64e07..37898db9c0eb52740286e6cea7ef3a436c5c03ea 100644 (file)
@@ -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>
index 23b79e55563781e9005d4a029c4fa506462d965e..0039130e25c24077b57b155e67e3a272bfdfaa73 100644 (file)
@@ -1,22 +1,22 @@
-# ih248.cnf\r
-# H.248 conformation file\r
-\r
-# $Id: h248.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $\r
-\r
-#.MODULE_IMPORT\r
-\r
-#.EXPORTS\r
-\r
-#.PDU\r
-\r
-#.NO_EMIT\r
-MtpAddress\r
-PkgdName\r
-\r
-#.TYPE_RENAME\r
-\r
-#.FIELD_RENAME\r
-\r
-#.END\r
-\r
-\r
+# ih248.cnf
+# H.248 conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+
+#.EXPORTS
+
+#.PDU
+
+#.NO_EMIT
+MtpAddress
+PkgdName
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
+
index 7fb911cf03694c5208b98c16a5f7a6d9c3948cec..7b30fb5656575d36e7344b6e32f19fa2cb144662 100644 (file)
@@ -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>
index 546f911f06dff7146f889e45288acf58e7e4c57b..a70b7fa14ace91c45f27bd271b70ace42d58b21d 100644 (file)
@@ -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>
index 8c35f27c168ba40ac57fae9e2df54e78fdd624a7..c3a227657d275274ba989065183ba5790f1a9fc4 100644 (file)
@@ -1,28 +1,28 @@
-# NS-CERT-EXT.cnf\r
-# NetScape Certificate Extensions conformation file\r
-\r
-# $Id: cms.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $\r
-\r
-#.MODULE_IMPORT\r
-\r
-#.EXPORTS\r
-\r
-#.PDU\r
-BaseUrl\r
-CaPolicyUrl\r
-CaRevocationUrl\r
-CertRenewalUrl\r
-CertType\r
-Comment\r
-RevocationUrl\r
-SslServerName\r
-\r
-#.NO_EMIT\r
-\r
-#.TYPE_RENAME\r
-\r
-#.FIELD_RENAME\r
-\r
-#.END\r
-\r
-\r
+# 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
+
+
index 6ab6c4e082b108932c8b312802d28db1b40033c2..f937c2a6d066f616acc136d2fd7831e0cdf6829d 100644 (file)
@@ -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>
index 8a72c72fff0139d39bffa130ae30dab52e7ba04f..fdbd43db25dfa68d2c6053c169e85debe3b290a8 100644 (file)
@@ -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>
index ee97f5d988b5b287a4fc5e56f16f3b90e8d2c85d..7445376f1eb8679222057dfd000e15a60c186a82 100644 (file)
@@ -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>
index 50201f11d47477261d049aa30356352d31bbab47..8facce40b4dad71b5aa906784b8f101afabc6745 100644 (file)
@@ -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>
index 76b5acd95f2f03806e695ae313effcbb151e018d..a94b0e603d71244cf8ce52273aa467ee860e4b2d 100644 (file)
@@ -1,25 +1,25 @@
-# pkcs1.cnf\r
-# PKCS#1 conformation file\r
-\r
-# $Id: pkcs1.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $\r
-\r
-#.MODULE_IMPORT\r
-AuthenticationFramework x509af\r
-\r
-#.INCLUDE ../x509af/x509af_exp.cnf\r
-\r
-#.EXPORTS\r
-\r
-RSAPrivateKey\r
-RSAPublicKey\r
-DigestInfo\r
-\r
-#.NO_EMIT\r
-\r
-#.TYPE_RENAME\r
-\r
-#.FIELD_RENAME\r
-\r
-#.END\r
-\r
-\r
+# 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
+
+
index 69e205d9e130b9b61c2b12070b7687e229d8dbc6..2dd03e6e09cc7e909090ac5d84934c365620d717 100644 (file)
@@ -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>
index 359982e91ca43fc77c54e880c04356f07ab69b2e..7f9e78edeb4ff61393891300416f3b4adf518bc4 100644 (file)
@@ -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>
index 104f27cd78b9d2ecde6908f8538909d1646e3fb0..6fc1ad5536cef65b661e1c1286e05164607724df 100644 (file)
@@ -1,24 +1,24 @@
-# pkinit.cnf\r
-# pkinit conformation file\r
-\r
-# $Id: pkinit.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $\r
-\r
-#.MODULE_IMPORT\r
-PKIX1Explicit88              pkix1explicit\r
-CryptographicMessageSyntax   cms\r
-\r
-#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf\r
-#.INCLUDE ../cms/cms_exp.cnf\r
-\r
-#.EXPORTS\r
-\r
-#.PDU\r
-\r
-#.NO_EMIT\r
-\r
-#.TYPE_RENAME\r
-\r
-#.FIELD_RENAME\r
-\r
-#.END\r
-\r
+# 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
+
index 2d9c452df6b46a3ae18faedc10f53bebe7df2813..27149af32283573f0f5ec08bd35de880e66d926f 100644 (file)
@@ -1,6 +1,6 @@
-\r
-#.IMPORT_TAG\r
-#.END\r
-\r
-#.TYPE_ATTR\r
-#.END\r
+
+#.IMPORT_TAG
+#.END
+
+#.TYPE_ATTR
+#.END
index 64d323a033ccee5ef5bfa175dfe0908bbb15aead..2f41512d92a0601075ef821340d3b7be59da95d5 100644 (file)
@@ -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>
index 0a385168b481aa12bb39ef326a9ba605b8e67dda..798ce7f0666734abb6f879d3571c281b371ccf29 100644 (file)
@@ -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>
index 68222450d30a34188cadac9a0184c2019d0a0efe..16f9d633d3496da4a69589c31ea15639fa582cac 100644 (file)
@@ -1,24 +1,24 @@
-# pkix1explicit.cnf\r
-# pkix1explicit conformation file\r
-\r
-# $Id: pkix1explicit.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $\r
-\r
-#.MODULE_IMPORT\r
-\r
-#.EXPORTS\r
-\r
-TeletexDomainDefinedAttribute\r
-TerminalType\r
-\r
-#.PDU\r
-\r
-#.NO_EMIT\r
-\r
-CertificateSerialNumber\r
-\r
-#.TYPE_RENAME\r
-\r
-#.FIELD_RENAME\r
-\r
-#.END\r
-\r
+# pkix1explicit.cnf
+# pkix1explicit conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+
+#.EXPORTS
+
+TeletexDomainDefinedAttribute
+TerminalType
+
+#.PDU
+
+#.NO_EMIT
+
+CertificateSerialNumber
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
index 32c46a31f64d2cba362d9d589f5af25e144ced3f..e7919fa143e709cbe1327ae08d20337340ddf93d 100644 (file)
@@ -1,19 +1,19 @@
-\r
-#.IMPORT_TAG\r
-AlgorithmIdentifier      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-CertificateSerialNumber  BER_CLASS_UNI BER_UNI_TAG_INTEGER\r
-Name                     BER_CLASS_ANY -1\r
-SubjectPublicKeyInfo     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-TeletexDomainDefinedAttribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-TerminalType             BER_CLASS_UNI BER_UNI_TAG_INTEGER\r
-#.END\r
-\r
-#.TYPE_ATTR\r
-CertificateSerialNumber  TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0\r
-Name                     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0\r
-SubjectPublicKeyInfo     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0\r
-TeletexDomainDefinedAttribute TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0\r
-TerminalType             TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0\r
-#.END\r
-\r
-\r
+
+#.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
+
+
index bd4f530b91bef5aae738238e188d67ce2e8f9c3b..27adda871cd6f18ffcad587afe8e11463f24e474 100644 (file)
@@ -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>
index e2977fdac3194ca57bcb670e8a088b2f8af4c114..12b712b5bc40dc2094bc0e8ff48b6a1f45a7547f 100644 (file)
@@ -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>
index c2796db0e7cebb9650b0599e48caa3357d47384a..13e37b4ed5130f5dfb69fe30c8a6c9e50851f177 100644 (file)
@@ -1,21 +1,21 @@
-# pkix1implicit.cnf\r
-# pkix1implicit conformation file\r
-\r
-# $Id: pkix1implicit.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $\r
-\r
-#.MODULE_IMPORT\r
-\r
-#.EXPORTS\r
-\r
-UserNotice\r
-\r
-#.PDU\r
-\r
-#.NO_EMIT\r
-\r
-#.TYPE_RENAME\r
-\r
-#.FIELD_RENAME\r
-\r
-#.END\r
-\r
+# pkix1implicit.cnf
+# pkix1implicit conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+
+#.EXPORTS
+
+UserNotice
+
+#.PDU
+
+#.NO_EMIT
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
index e6c217ec9096dc7258fafcf17c06f90dd4a7c264..3c0a87cf39267e3253d23f7ffd67c7db410e3972 100644 (file)
@@ -1,8 +1,8 @@
-\r
-#.IMPORT_TAG\r
-UserNotice               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-#.END\r
-\r
-#.TYPE_ATTR\r
-UserNotice               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0\r
-#.END\r
+
+#.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
index 20617d8ccbd8440f6d2c32235019deaa53cf7923..ba21daaa7b243c832642c7575fb768aef746ea87 100755 (executable)
--- Module AuthenticationFramework (X.509:08/1997)\r
-\r
-AuthenticationFramework {joint-iso-itu-t ds(5) module(1)\r
-  authenticationFramework(7) 3} DEFINITIONS ::=\r
-BEGIN\r
-\r
---  EXPORTS All \r
---  The types and values defined in this module are exported for use in the other ASN.1 modules contained\r
---  within the Directory Specifications, and for the use of other applications which will use them to access\r
---  Directory services. Other applications may use them for their own purposes, but this will not constrain\r
---  extensions and modifications needed to maintain or improve the Directory service.\r
-IMPORTS\r
-  id-at, id-mr, informationFramework, upperBounds, selectedAttributeTypes,\r
-    basicAccessControl, certificateExtensions\r
-    FROM UsefulDefinitions {joint-iso-itu-t ds(5) module(1)\r
-      usefulDefinitions(0) 3}\r
-  Name, ATTRIBUTE, AttributeType, MATCHING-RULE, Attribute\r
-    FROM InformationFramework informationFramework\r
-  ub-user-password\r
-    FROM UpperBounds upperBounds\r
-  AuthenticationLevel\r
-    FROM BasicAccessControl basicAccessControl\r
-  UniqueIdentifier, octetStringMatch\r
-    FROM SelectedAttributeTypes selectedAttributeTypes\r
-  certificateExactMatch, certificatePairExactMatch, certificateListExactMatch,\r
-    GeneralNames\r
-    FROM CertificateExtensions certificateExtensions;\r
-\r
---  basic certificate definition\r
-Certificate ::= SEQUENCE {\r
-  signedCertificate SEQUENCE {\r
-               version                  [0]  Version DEFAULT v1,\r
-               serialNumber             CertificateSerialNumber,\r
-               signature                AlgorithmIdentifier,\r
-               issuer                   Name,\r
-               validity                 Validity,\r
-               subject                  Name,\r
-               subjectPublicKeyInfo     SubjectPublicKeyInfo,\r
-               issuerUniqueIdentifier   [1] IMPLICIT UniqueIdentifier OPTIONAL,\r
-               --  if present, version must be v2 or v3\r
-               subjectUniqueIdentifier  [2] IMPLICIT UniqueIdentifier OPTIONAL,\r
-               --  if present, version must be v2 or v3\r
-               extensions               [3]  Extensions OPTIONAL\r
-               --  If present, version must be v3 -- },\r
-  algorithmIdentifier  AlgorithmIdentifier,\r
-  encrypted            BIT STRING\r
-}\r
-\r
-Version ::= INTEGER {v1(0), v2(1), v3(2)}\r
-\r
-CertificateSerialNumber ::= INTEGER\r
-\r
--- Can not be handled by compiler. Handimplemented in the template\r
-AlgorithmIdentifier ::= SEQUENCE {\r
---  algorithm   ALGORITHM.&id({SupportedAlgorithms}),\r
---  parameters  ALGORITHM.&Type({SupportedAlgorithms}{@algorithm}) OPTIONAL\r
-}\r
-\r
---     Definition of the following information object set is deferred, perhaps to standardized\r
---     profiles or to protocol implementation conformance statements. The set is required to\r
---     specify a table constraint on the parameters component of AlgorithmIdentifier.\r
---SupportedAlgorithms ALGORITHM ::=\r
---{...}\r
-\r
-Validity ::= SEQUENCE {notBefore  Time,\r
-                       notAfter   Time\r
-}\r
-\r
-SubjectPublicKeyInfo ::= SEQUENCE {\r
-  algorithm         AlgorithmIdentifier,\r
-  subjectPublicKey  BIT STRING\r
-}\r
-\r
-Time ::= CHOICE {utcTime          UTCTime,\r
-                 generalizedTime  GeneralizedTime\r
-}\r
-\r
-Extensions ::= SEQUENCE OF Extension\r
-\r
---  For those extensions where ordering of individual extensions within the SEQUENCE is significant, the\r
---  specification of those individual extensions shall include the rules for the significance of the order therein\r
--- XXX Implemented by hand in the template\r
-Extension ::= SEQUENCE {\r
---  extnId     EXTENSION.&id({ExtensionSet}),\r
---  critical   BOOLEAN DEFAULT FALSE,\r
---  extnValue  OCTET STRING\r
---    contains a DER encoding of a value of type &ExtnType\r
---    for the extension object identified by extnId \r
-}\r
-\r
---ExtensionSet EXTENSION ::=\r
---  {...}\r
-\r
---EXTENSION ::= CLASS {&id        OBJECT IDENTIFIER UNIQUE,\r
---                     &ExtnType  \r
---}WITH SYNTAX {SYNTAX &ExtnType\r
---              IDENTIFIED BY &id\r
---}\r
-\r
---  other certificate constructs\r
-Certificates ::= SEQUENCE {\r
-  userCertificate    Certificate,\r
-  certificationPath  ForwardCertificationPath OPTIONAL\r
-}\r
-\r
-ForwardCertificationPath ::= SEQUENCE OF CrossCertificates\r
-\r
-CrossCertificates ::= SET OF Certificate\r
-\r
-CertificationPath ::= SEQUENCE {\r
-  userCertificate    Certificate,\r
-  theCACertificates  SEQUENCE OF CertificatePair OPTIONAL\r
-}\r
-\r
-CertificatePair ::= SEQUENCE {\r
-  issuedByThisCA  [0]  Certificate OPTIONAL,\r
-  issuedToThisCA  [1]  Certificate OPTIONAL\r
-  --  at least one of the pair shall be present \r
-}\r
-\r
---  Certificate Revocation List (CRL)\r
-CertificateList ::= SEQUENCE {\r
-    signedCertificateList SEQUENCE {\r
-               version              Version OPTIONAL,\r
-               --  if present, version must be v2\r
-               signature            AlgorithmIdentifier,\r
-               issuer               Name,\r
-               thisUpdate           Time,\r
-               nextUpdate           Time OPTIONAL,\r
-               revokedCertificates\r
-                 SEQUENCE OF\r
-                   SEQUENCE {userCertificate     CertificateSerialNumber,\r
-                             revocationDate      Time,\r
-                             crlEntryExtensions  Extensions OPTIONAL} OPTIONAL,\r
-               crlExtensions        [0]  Extensions OPTIONAL},\r
-  algorithmIdentifier  AlgorithmIdentifier,\r
-  encrypted            BIT STRING\r
-}\r
-\r
---  attribute certificate\r
-AttributeCertificationPath ::= SEQUENCE {\r
-  attributeCertificate  AttributeCertificate,\r
-  acPath                SEQUENCE OF ACPathData OPTIONAL\r
-}\r
-\r
-ACPathData ::= SEQUENCE {\r
-  certificate           [0]  Certificate OPTIONAL,\r
-  attributeCertificate  [1]  AttributeCertificate OPTIONAL\r
-}\r
-\r
---attributeCertificate ATTRIBUTE ::= {\r
---  WITH SYNTAX             AttributeCertificate\r
---  EQUALITY MATCHING RULE  attributeCertificateMatch\r
---  ID                      id-at-attributeCertificate\r
---}\r
-\r
-AttributeCertificate ::= SEQUENCE {\r
-  signedAttributeCertificateInfo AttributeCertificateInfo,\r
-  algorithmIdentifier  AlgorithmIdentifier,\r
-  encrypted            BIT STRING\r
-}\r
-\r
-AttributeCertificateInfo ::= SEQUENCE {\r
-  version                Version DEFAULT v1,\r
-  subject\r
-    CHOICE {baseCertificateID  [0]  IssuerSerial,\r
-            subjectName        [1]  GeneralNames\r
-           },\r
-  issuer                 GeneralNames,\r
-  signature              AlgorithmIdentifier,\r
-  serialNumber           CertificateSerialNumber,\r
-  attCertValidityPeriod  AttCertValidityPeriod,\r
-  attributes             SEQUENCE OF Attribute,\r
-  issuerUniqueID         UniqueIdentifier OPTIONAL,\r
-  extensions             Extensions OPTIONAL\r
-}\r
-\r
-IssuerSerial ::= SEQUENCE {\r
-  issuer     GeneralNames,\r
-  serial     CertificateSerialNumber,\r
-  issuerUID  UniqueIdentifier OPTIONAL\r
-}\r
-\r
-AttCertValidityPeriod ::= SEQUENCE {\r
-  notBeforeTime  GeneralizedTime,\r
-  notAfterTime   GeneralizedTime\r
-}\r
-\r
---attributeCertificateMatch MATCHING-RULE ::= {\r
---  SYNTAX  AttributeCertificateAssertion\r
---  ID      id-mr-attributeCertificateMatch\r
---}\r
-\r
-AttributeCertificateAssertion ::= SEQUENCE {\r
-  subject\r
-    [0]  CHOICE {baseCertificateID  [0]  IssuerSerial,\r
-                 subjectName        [1]  Name} OPTIONAL,\r
-  issuer           [1]  Name OPTIONAL,\r
-  attCertValidity  [2]  GeneralizedTime OPTIONAL,\r
-  attType          [3]  SET OF AttributeType OPTIONAL\r
-}\r
-\r
---  At least one component of the sequence must be present\r
---  attribute types \r
---userPassword ATTRIBUTE ::= {\r
---  WITH SYNTAX             OCTET STRING(SIZE (0..ub-user-password))\r
---  EQUALITY MATCHING RULE  octetStringMatch\r
---  ID                      id-at-userPassword\r
---}\r
-\r
---userCertificate ATTRIBUTE ::= {\r
---  WITH SYNTAX             Certificate\r
---  EQUALITY MATCHING RULE  certificateExactMatch\r
---  ID                      id-at-userCertificate\r
---}\r
-\r
---cACertificate ATTRIBUTE ::= {\r
---  WITH SYNTAX             Certificate\r
---  EQUALITY MATCHING RULE  certificateExactMatch\r
---  ID                      id-at-cAcertificate\r
---}\r
-\r
---crossCertificatePair ATTRIBUTE ::= {\r
---  WITH SYNTAX             CertificatePair\r
---  EQUALITY MATCHING RULE  certificatePairExactMatch\r
---  ID                      id-at-crossCertificatePair\r
---}\r
-\r
---authorityRevocationList ATTRIBUTE ::= {\r
---  WITH SYNTAX             CertificateList\r
---  EQUALITY MATCHING RULE  certificateListExactMatch\r
---  ID                      id-at-authorityRevocationList\r
---}\r
-\r
---certificateRevocationList ATTRIBUTE ::= {\r
---  WITH SYNTAX             CertificateList\r
---  EQUALITY MATCHING RULE  certificateListExactMatch\r
---  ID                      id-at-certificateRevocationList\r
---}\r
-\r
---attributeCertificateRevocationList ATTRIBUTE ::= {\r
---  WITH SYNTAX  CertificateList\r
---  ID           id-at-attributeCertificateRevocationList\r
---}\r
-\r
---  information object classes \r
---ALGORITHM ::= TYPE-IDENTIFIER\r
-\r
---  object identifier assignments \r
---id-at-userPassword OBJECT IDENTIFIER ::=\r
---  {id-at 35}\r
-\r
-id-at-userCertificate OBJECT IDENTIFIER ::= {id-at 36}\r
-\r
-id-at-cAcertificate OBJECT IDENTIFIER ::= {id-at 37}\r
-\r
-id-at-authorityRevocationList OBJECT IDENTIFIER ::= {id-at 38}\r
-\r
-id-at-certificateRevocationList OBJECT IDENTIFIER ::= {id-at 39}\r
-\r
-id-at-crossCertificatePair OBJECT IDENTIFIER ::= {id-at 40}\r
-\r
-id-at-attributeCertificate OBJECT IDENTIFIER ::= {id-at 58}\r
-\r
-id-at-attributeCertificateRevocationList OBJECT IDENTIFIER ::= {id-at 59}\r
-\r
---id-mr-attributeCertificateMatch OBJECT IDENTIFIER ::= {id-mr 42}\r
-\r
-END\r
-\r
--- Generated by Asnp, the ASN.1 pretty-printer of France Telecom R&D\r
-\r
+-- 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
+
index cbd0a6e7961d6149f415f058900c4597e0254288..99ca9d925f7f4e4db5eb4cc71feedde18388e834 100644 (file)
@@ -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>
index 52ec3c91ea1a932ed21e650228735c75f849d2e8..ded2f563395cf86a7b323c1519aeec691da98367 100644 (file)
@@ -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>
index cdcd199a9287cb558359ff94af96186c35a6349e..1a1edc0a79bce3efefef82301ab08f1760f17779 100644 (file)
@@ -1,53 +1,53 @@
-# x509.cnf\r
-# X509 conformation file\r
-\r
-# $Id: x509.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $\r
-\r
-#.MODULE_IMPORT\r
-InformationFramework x509if\r
-CertificateExtensions x509ce\r
-SelectedAttributeTypes x509sat\r
-\r
-#.INCLUDE ../x509ce/x509ce_exp.cnf\r
-#.INCLUDE ../x509if/x509if_exp.cnf\r
-#.INCLUDE ../x509sat/x509sat_exp.cnf\r
-\r
-#.EXPORTS\r
-\r
-AttributeCertificate\r
-AttributeCertificateAssertion\r
-AttributeCertificationPath\r
-Certificate\r
-Certificates\r
-CertificateList\r
-CertificateSerialNumber\r
-CertificationPath\r
-SubjectPublicKeyInfo\r
-\r
-#.PDU\r
-AttributeCertificate\r
-Certificate\r
-CertificateList\r
-CertificatePair\r
-\r
-#.NO_EMIT\r
-\r
-AlgorithmIdentifier\r
-Extension\r
-\r
-#.TYPE_RENAME\r
-AttributeCertificateInfo/subject       InfoSubject\r
-AttributeCertificateAssertion/subject  AssertionSubject\r
-\r
-#.FIELD_RENAME\r
-AttributeCertificateInfo/subject info_subject\r
-AttributeCertificateAssertion/subject assertion_subject\r
-\r
-AttributeCertificateAssertion/issuer assertionIssuer\r
-\r
-AttributeCertificateInfo/subject/subjectName      infoSubjectName\r
-AttributeCertificateAssertion/subject/subjectName assertionSubjectName\r
-\r
-#.END\r
-\r
-\r
+# 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
+
+
index 0368d58dc3eb2e6148fa0f3a582d697a00337259..690fb2011704539d63cf9c70d8b48a5ab68be8e7 100644 (file)
@@ -1,25 +1,25 @@
-\r
-#.IMPORT_TAG\r
-AlgorithmIdentifier BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-AttributeCertificate     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-AttributeCertificateAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-AttributeCertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-Certificate              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-CertificateSerialNumber  BER_CLASS_UNI BER_UNI_TAG_INTEGER\r
-Certificates             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-CertificationPath        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-CertificateList          BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-SubjectPublicKeyInfo     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-#.END\r
-\r
-#.TYPE_ATTR\r
-Certificate              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0\r
-CertificateSerialNumber  TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0\r
-Certificates             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0\r
-CertificationPath        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0\r
-CertificateList          TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0\r
-AttributeCertificationPath TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0\r
-AttributeCertificate     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0\r
-AttributeCertificateAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0\r
-SubjectPublicKeyInfo     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0\r
-#.END\r
+
+#.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
index 4eac24810164cce473cbcba39a27135795219b40..5f8c7174890eb884d12b1e125e86de5555eabebf 100644 (file)
@@ -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>
index 92acac5a58b06b7fec26f334fb3a215f76cd9eca..f88f4ee741bdd01b044e1bb8753faad2a426fc9f 100644 (file)
@@ -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>
index f393a5810426544e59e68aee30ac3660f3e7c1e3..5baaf95ed77fcf5dc16dbf74870ddbd6e73830a2 100644 (file)
@@ -1,53 +1,53 @@
-# x509ce.cnf\r
-# X509CE conformation file\r
-\r
-# $Id: x509ce.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $\r
-\r
-#.MODULE_IMPORT\r
-InformationFramework x509if\r
-AuthenticationFramework x509af\r
-SelectedAttributeTypes x509sat\r
-\r
-#.INCLUDE ../x509if/x509if_exp.cnf\r
-#.INCLUDE ../x509af/x509af_exp.cnf\r
-#.INCLUDE ../x509sat/x509sat_exp.cnf\r
-\r
-#.EXPORTS\r
-\r
-GeneralNames\r
-\r
-#.PDU\r
-AttributesSyntax\r
-AuthorityKeyIdentifier\r
-BaseCRLNumber\r
-BasicConstraintsSyntax\r
-CertificatePoliciesSyntax\r
-CRLDistPointsSyntax\r
-CRLNumber\r
-CRLReason\r
-CRLScopeSyntax\r
-CRLStreamIdentifier\r
-DeltaInformation\r
-GeneralNames\r
-HoldInstruction\r
-IssuingDistPointSyntax\r
-KeyPurposeIDs\r
-KeyUsage\r
-NameConstraintsSyntax\r
-OrderedListSyntax\r
-PolicyConstraintsSyntax\r
-PolicyMappingsSyntax\r
-PrivateKeyUsagePeriod\r
-SkipCerts\r
-StatusReferrals\r
-SubjectKeyIdentifier\r
-\r
-#.NO_EMIT\r
-\r
-#.TYPE_RENAME\r
-\r
-#.FIELD_RENAME\r
-\r
-#.END\r
-\r
-\r
+# 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
+
+
index 59efe2a579c114afa611498e4114cba030aeb69c..32759fde3bcf886d8f99351b794394e3d0e6728a 100644 (file)
@@ -1,4 +1,4 @@
-\r
-#.IMPORT_TAG\r
-GeneralNames     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE\r
-\r
+
+#.IMPORT_TAG
+GeneralNames     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+
index ad72e717378793689f52e49a999de1908579d8ba..768c119b2637ba6a3e42ea7b03619e236ef83112 100644 (file)
@@ -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>
index 3ec1866b2abdb4da2fa700dbea3ad6c8e1aaeaad..a26f815ce88336238ee5fea993a3ade02bb22a97 100644 (file)
@@ -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>
index 953113810e5295375e1f53ea69bea974b8f711b7..6569ccfbb7e2fb3b292eb625a4e9552c04518b2b 100644 (file)
@@ -1,24 +1,24 @@
-# x509if.cnf\r
-# X509IF conformation file\r
-\r
-# $Id: x509if.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $\r
-\r
-#.MODULE_IMPORT\r
-\r
-#.EXPORTS\r
-\r
-AttributeType\r
-Name\r
-RelativeDistinguishedName\r
-\r
-#.NO_EMIT\r
-\r
-AttributeTypeAndDistinguishedValue\r
-\r
-#.TYPE_RENAME\r
-\r
-#.FIELD_RENAME\r
-\r
-#.END\r
-\r
-\r
+# x509if.cnf
+# X509IF conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+
+#.EXPORTS
+
+AttributeType
+Name
+RelativeDistinguishedName
+
+#.NO_EMIT
+
+AttributeTypeAndDistinguishedValue
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
+
index fd68d6daf12f72fdc4c29ea4e8136dc0caddc4a2..1f983b5abaf246ec596e20b5289a7853ba5845f7 100644 (file)
@@ -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>
index 8b820c485cccf7f18f6440c1797d18a75fbcc4c6..ecde979f63a3d07153e238c7683a42dbd8494a0b 100644 (file)
@@ -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>
index bd72ba8c3f9aa00b3526bb6d42b6da44177f9666..d611ce1adaeb3b682e99e1537e0c9a1d92a19c82 100644 (file)
@@ -1,21 +1,21 @@
-# x509sat.cnf\r
-# X509SAT conformation file\r
-\r
-# $Id: x509sat.cnf,v 1.2 2004/06/03 08:35:44 guy Exp $\r
-\r
-#.MODULE_IMPORT\r
-InformationFramework x509if\r
-\r
-#.EXPORTS\r
-\r
-UniqueIdentifier\r
-\r
-#.NO_EMIT\r
-\r
-#.TYPE_RENAME\r
-\r
-#.FIELD_RENAME\r
-\r
-#.END\r
-\r
-\r
+# x509sat.cnf
+# X509SAT conformation file
+
+# $Id$
+
+#.MODULE_IMPORT
+InformationFramework x509if
+
+#.EXPORTS
+
+UniqueIdentifier
+
+#.NO_EMIT
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
+
index e091fddeffaa828614b025510e7345321323b656..426e88f57f4309132299f830d167da34a15aa3b0 100644 (file)
@@ -1,4 +1,4 @@
-\r
-#.IMPORT_TAG\r
-UniqueIdentifier BER_CLASS_UNI BER_UNI_TAG_BITSTRING\r
-DirectoryString  BER_CLASS_UNI BER_UNI_TAG_CHOICE\r
+
+#.IMPORT_TAG
+UniqueIdentifier BER_CLASS_UNI BER_UNI_TAG_BITSTRING
+DirectoryString  BER_CLASS_UNI BER_UNI_TAG_CHOICE