diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-11-21 10:16:06 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-11-21 10:16:06 +0000 |
| commit | 00e3474dec2f8732183e39f8f3bc6fe14ef1b316 (patch) | |
| tree | 1c4926614795982d3bf2c1ca18509611fba7d30a /asn1 | |
| parent | dab0c0fa2c27f769ceeccf8d000f3e6d43211b0c (diff) | |
cleanup for x509af
svn path=/trunk/; revision=12558
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/cms/cms.cnf | 2 | ||||
| -rw-r--r-- | asn1/pkcs1/pkcs1.cnf | 2 | ||||
| -rw-r--r-- | asn1/pkixqualified/pkixqualified.cnf | 2 | ||||
| -rwxr-xr-x | asn1/x509af/Makefile | 5 | ||||
| -rw-r--r-- | asn1/x509af/x509af-exp.cnf | 50 | ||||
| -rw-r--r-- | asn1/x509af/x509af.cnf | 12 | ||||
| -rw-r--r-- | asn1/x509af/x509af_exp.cnf | 25 | ||||
| -rw-r--r-- | asn1/x509ce/x509ce.cnf | 2 |
8 files changed, 71 insertions, 29 deletions
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index cacf1b30a8..aeead66849 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -7,7 +7,7 @@ AuthenticationFramework x509af InformationFramework x509if -#.INCLUDE ../x509af/x509af_exp.cnf +#.INCLUDE ../x509af/x509af-exp.cnf #.INCLUDE ../x509if/x509if-exp.cnf #.EXPORTS diff --git a/asn1/pkcs1/pkcs1.cnf b/asn1/pkcs1/pkcs1.cnf index a94b0e603d..5355fd96c0 100644 --- a/asn1/pkcs1/pkcs1.cnf +++ b/asn1/pkcs1/pkcs1.cnf @@ -6,7 +6,7 @@ #.MODULE_IMPORT AuthenticationFramework x509af -#.INCLUDE ../x509af/x509af_exp.cnf +#.INCLUDE ../x509af/x509af-exp.cnf #.EXPORTS diff --git a/asn1/pkixqualified/pkixqualified.cnf b/asn1/pkixqualified/pkixqualified.cnf index 5393462e2e..6cd993286b 100644 --- a/asn1/pkixqualified/pkixqualified.cnf +++ b/asn1/pkixqualified/pkixqualified.cnf @@ -9,7 +9,7 @@ AuthenticationFramework x509af SelectedAttributeTypes x509sat #.INCLUDE ../x509ce/x509ce-exp.cnf -#.INCLUDE ../x509af/x509af_exp.cnf +#.INCLUDE ../x509af/x509af-exp.cnf #.INCLUDE ../x509sat/x509sat-exp.cnf #.EXPORTS diff --git a/asn1/x509af/Makefile b/asn1/x509af/Makefile new file mode 100755 index 0000000000..e0100d4649 --- /dev/null +++ b/asn1/x509af/Makefile @@ -0,0 +1,5 @@ + +../../epan/dissectors/packet-x509af.c : ../../tools/asn2eth.py AuthenticationFramework.asn packet-x509af-template.c packet-x509af-template.h x509af.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509ce/x509ce-exp.cnf + python ../../tools/asn2eth.py -X -b -k -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn + cp packet-x509af.* ../../epan/dissectors + diff --git a/asn1/x509af/x509af-exp.cnf b/asn1/x509af/x509af-exp.cnf new file mode 100644 index 0000000000..20f16dd83b --- /dev/null +++ b/asn1/x509af/x509af-exp.cnf @@ -0,0 +1,50 @@ +#.IMPORT_TAG +Certificate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +Version BER_CLASS_UNI BER_UNI_TAG_INTEGER +CertificateSerialNumber BER_CLASS_UNI BER_UNI_TAG_INTEGER +AlgorithmIdentifier BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +Validity BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +SubjectPublicKeyInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +Time BER_CLASS_UNI -1/*choice*/ +Extensions BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +Extension BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +Certificates BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +ForwardCertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +CrossCertificates BER_CLASS_UNI BER_UNI_TAG_SET +CertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +CertificatePair BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +CertificateList BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +AttributeCertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +ACPathData BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +AttributeCertificate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +AttributeCertificateInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +IssuerSerial BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +AttCertValidityPeriod BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +AttributeCertificateAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +#.END + +#.TYPE_ATTR +Certificate TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +Version TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(Version_vals) BITMASK = 0 +CertificateSerialNumber TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +AlgorithmIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +Validity TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +SubjectPublicKeyInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +Time TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(Time_vals) BITMASK = 0 +Extensions TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +Extension TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +Certificates TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +ForwardCertificationPath TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +CrossCertificates TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +CertificationPath TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +CertificatePair 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 +ACPathData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +AttributeCertificate TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +AttributeCertificateInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +IssuerSerial TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +AttCertValidityPeriod TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +AttributeCertificateAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +#.END + diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf index 3cadc80a5d..b2f8557c30 100644 --- a/asn1/x509af/x509af.cnf +++ b/asn1/x509af/x509af.cnf @@ -13,16 +13,28 @@ SelectedAttributeTypes x509sat #.INCLUDE ../x509sat/x509sat-exp.cnf #.EXPORTS +ACPathData AlgorithmIdentifier +AttCertValidityPeriod AttributeCertificate AttributeCertificateAssertion +AttributeCertificateInfo AttributeCertificationPath Certificate Certificates CertificateList +CertificatePair CertificateSerialNumber CertificationPath +CrossCertificates +Extension +Extensions +ForwardCertificationPath +IssuerSerial SubjectPublicKeyInfo +Time +Validity +Version #.PDU diff --git a/asn1/x509af/x509af_exp.cnf b/asn1/x509af/x509af_exp.cnf deleted file mode 100644 index 690fb20117..0000000000 --- a/asn1/x509af/x509af_exp.cnf +++ /dev/null @@ -1,25 +0,0 @@ - -#.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/x509ce.cnf b/asn1/x509ce/x509ce.cnf index 443378eb47..968b0b9b91 100644 --- a/asn1/x509ce/x509ce.cnf +++ b/asn1/x509ce/x509ce.cnf @@ -9,7 +9,7 @@ AuthenticationFramework x509af SelectedAttributeTypes x509sat #.INCLUDE ../x509if/x509if-exp.cnf -#.INCLUDE ../x509af/x509af_exp.cnf +#.INCLUDE ../x509af/x509af-exp.cnf #.INCLUDE ../x509sat/x509sat-exp.cnf #.EXPORTS |