cleanup for x509ce

svn path=/trunk/; revision=12557

8 files changed, 266 insertions, 114 deletions

diff --git a/asn1/pkixqualified/pkixqualified.cnf b/asn1/pkixqualified/pkixqualified.cnf
index bdcc09ab59..5393462e2e 100644
--- a/asn1/pkixqualified/pkixqualified.cnf
+++ b/asn1/pkixqualified/pkixqualified.cnf
@@ -8,9 +8,9 @@ CertificateExtensions x509ce
 AuthenticationFramework x509af
 SelectedAttributeTypes x509sat
 
-#.INCLUDE ../x509ce/x509ce_exp.cnf
+#.INCLUDE ../x509ce/x509ce-exp.cnf
 #.INCLUDE ../x509af/x509af_exp.cnf
-#.INCLUDE ../x509sat/x509sat_exp.cnf
+#.INCLUDE ../x509sat/x509sat-exp.cnf
 
 #.EXPORTS
 
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index 2f8b2e2c5a..3cadc80a5d 100644
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -8,7 +8,7 @@ InformationFramework x509if
 CertificateExtensions x509ce
 SelectedAttributeTypes x509sat
 
-#.INCLUDE ../x509ce/x509ce_exp.cnf
+#.INCLUDE ../x509ce/x509ce-exp.cnf
 #.INCLUDE ../x509if/x509if-exp.cnf
 #.INCLUDE ../x509sat/x509sat-exp.cnf
 
diff --git a/asn1/x509ce/CertificateExtensions.asn b/asn1/x509ce/CertificateExtensions.asn
index d8ab1b7ca1..ac02f96a48 100644
--- a/asn1/x509ce/CertificateExtensions.asn
+++ b/asn1/x509ce/CertificateExtensions.asn
@@ -72,7 +72,7 @@ KeyUsage ::= BIT STRING {
 --   IDENTIFIED BY  id-ce-extKeyUsage
 -- }
  
-KeyPurposeIDs ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
+KeyPurposeIDs ::= SEQUENCE OF KeyPurposeId
 
 KeyPurposeId ::= OBJECT IDENTIFIER
 
@@ -107,14 +107,15 @@ PolicyInformation ::= SEQUENCE {
 
 CertPolicyId ::= OBJECT IDENTIFIER
 
--- XXX this one needs to be handimplemented in the template
+PolicyQualifierId ::= OBJECT IDENTIFIER
+
+PolicyQualifierValue ::= ANY
+
 PolicyQualifierInfo ::= SEQUENCE {
---  policyQualifierId  CERT-POLICY-QUALIFIER.&id({SupportedPolicyQualifiers}),
---   qualifier
---     CERT-POLICY-QUALIFIER.&Qualifier
---       ({SupportedPolicyQualifiers}{@policyQualifierId}) OPTIONAL
+  policyQualifierId  PolicyQualifierId,
+  qualifier          PolicyQualifierValue OPTIONAL
 }
--- 
+
 -- SupportedPolicyQualifiers CERT-POLICY-QUALIFIER ::=
 --   {...}
 -- 
@@ -195,7 +196,7 @@ NameConstraintsSyntax ::= SEQUENCE {
   excludedSubtrees   [1]  IMPLICIT GeneralSubtrees OPTIONAL
 }
 
-GeneralSubtrees ::= SEQUENCE SIZE (1..MAX) OF GeneralSubtree
+GeneralSubtrees ::= SEQUENCE OF GeneralSubtree
 
 GeneralSubtree ::= SEQUENCE {
   base     GeneralName,
@@ -288,7 +289,6 @@ StatusReferrals ::= SEQUENCE SIZE (1..MAX) OF StatusReferral
 
 StatusReferral ::= CHOICE {
   cRLReferral    [0]  IMPLICIT CRLReferral
---  cRLReferral    [0]  IMPLICIT CRLReferral,
 --  otherReferral  [1]  IMPLICIT INSTANCE OF OTHER-REFERRAL
 }
 
@@ -406,52 +406,52 @@ BaseCRLNumber ::= CRLNumber
 --   SYNTAX  CertificateExactAssertion
 --   ID      id-mr-certificateExactMatch
 -- }
--- 
--- CertificateExactAssertion ::= SEQUENCE {
---   serialNumber  CertificateSerialNumber,
---   issuer        Name
--- }
--- 
+
+CertificateExactAssertion ::= SEQUENCE {
+  serialNumber  CertificateSerialNumber,
+  issuer        Name
+}
+
 -- certificateMatch MATCHING-RULE ::= {
 --   SYNTAX  CertificateAssertion
 --   ID      id-mr-certificateMatch
 -- }
--- 
--- CertificateAssertion ::= SEQUENCE {
---   serialNumber            [0]  IMPLICIT CertificateSerialNumber OPTIONAL,
---   issuer                  [1]  IMPLICIT Name OPTIONAL,
---   subjectKeyIdentifier    [2]  IMPLICIT SubjectKeyIdentifier OPTIONAL,
---   authorityKeyIdentifier  [3]  IMPLICIT AuthorityKeyIdentifier OPTIONAL,
---   certificateValid        [4]  IMPLICIT Time OPTIONAL,
---   privateKeyValid         [5]  IMPLICIT GeneralizedTime OPTIONAL,
---   subjectPublicKeyAlgID   [6]  IMPLICIT OBJECT IDENTIFIER OPTIONAL,
---   keyUsage                [7]  IMPLICIT KeyUsage OPTIONAL,
---   subjectAltName          [8]  IMPLICIT AltNameType OPTIONAL,
---   policy                  [9]  IMPLICIT CertPolicySet OPTIONAL,
---   pathToName              [10]  IMPLICIT Name OPTIONAL,
---   subject                 [11]  IMPLICIT Name OPTIONAL,
---   nameConstraints         [12]  IMPLICIT NameConstraintsSyntax OPTIONAL
--- }
--- 
--- AltNameType ::= CHOICE {
---   builtinNameForm
---     ENUMERATED {rfc822Name(1), dNSName(2), x400Address(3), directoryName(4),
---                 ediPartyName(5), uniformResourceIdentifier(6), iPAddress(7),
---                 registeredId(8)},
---   otherNameForm    OBJECT IDENTIFIER
--- }
--- 
--- CertPolicySet ::= SEQUENCE SIZE (1..MAX) OF CertPolicyId
--- 
+
+CertificateAssertion ::= SEQUENCE {
+  serialNumber            [0]  IMPLICIT CertificateSerialNumber OPTIONAL,
+  issuer                  [1]  IMPLICIT Name OPTIONAL,
+  subjectKeyIdentifier    [2]  IMPLICIT SubjectKeyIdentifier OPTIONAL,
+  authorityKeyIdentifier  [3]  IMPLICIT AuthorityKeyIdentifier OPTIONAL,
+--  certificateValid        [4]  IMPLICIT Time OPTIONAL,
+  privateKeyValid         [5]  IMPLICIT GeneralizedTime OPTIONAL,
+  subjectPublicKeyAlgID   [6]  IMPLICIT OBJECT IDENTIFIER OPTIONAL,
+  keyUsage                [7]  IMPLICIT KeyUsage OPTIONAL,
+  subjectAltName          [8]  IMPLICIT AltNameType OPTIONAL,
+  policy                  [9]  IMPLICIT CertPolicySet OPTIONAL,
+  pathToName              [10]  IMPLICIT Name OPTIONAL,
+  subject                 [11]  IMPLICIT Name OPTIONAL,
+  nameConstraints         [12]  IMPLICIT NameConstraintsSyntax OPTIONAL
+}
+
+AltNameType ::= CHOICE {
+  builtinNameForm
+    ENUMERATED {rfc822Name(1), dNSName(2), x400Address(3), directoryName(4),
+                ediPartyName(5), uniformResourceIdentifier(6), iPAddress(7),
+                registeredId(8)},
+  otherNameForm    OBJECT IDENTIFIER
+}
+
+CertPolicySet ::= SEQUENCE SIZE (1..MAX) OF CertPolicyId
+
 -- certificatePairExactMatch MATCHING-RULE ::= {
 --   SYNTAX  CertificatePairExactAssertion
 --   ID      id-mr-certificatePairExactMatch
 -- }
--- 
--- CertificatePairExactAssertion ::= SEQUENCE {
---   issuedToThisCAAssertion  [0]  IMPLICIT CertificateExactAssertion OPTIONAL,
---   issuedByThisCAAssertion  [1]  IMPLICIT CertificateExactAssertion OPTIONAL
--- }
+
+CertificatePairExactAssertion ::= SEQUENCE {
+  issuedToThisCAAssertion  [0]  IMPLICIT CertificateExactAssertion OPTIONAL,
+  issuedByThisCAAssertion  [1]  IMPLICIT CertificateExactAssertion OPTIONAL
+}
 -- (WITH COMPONENTS {
 --    ...,
 --    issuedToThisCAAssertion  PRESENT
@@ -464,11 +464,11 @@ BaseCRLNumber ::= CRLNumber
 --   SYNTAX  CertificatePairAssertion
 --   ID      id-mr-certificatePairMatch
 -- }
--- 
--- CertificatePairAssertion ::= SEQUENCE {
---   issuedToThisCAAssertion  [0]  IMPLICIT CertificateAssertion OPTIONAL,
---   issuedByThisCAAssertion  [1]  IMPLICIT CertificateAssertion OPTIONAL
--- }
+
+CertificatePairAssertion ::= SEQUENCE {
+  issuedToThisCAAssertion  [0]  IMPLICIT CertificateAssertion OPTIONAL,
+  issuedByThisCAAssertion  [1]  IMPLICIT CertificateAssertion OPTIONAL
+}
 -- (WITH COMPONENTS {
 --    ...,
 --    issuedToThisCAAssertion  PRESENT
@@ -481,28 +481,28 @@ BaseCRLNumber ::= CRLNumber
 --   SYNTAX  CertificateListExactAssertion
 --   ID      id-mr-certificateListExactMatch
 -- }
--- 
--- CertificateListExactAssertion ::= SEQUENCE {
---   issuer             Name,
---   thisUpdate         Time,
---   distributionPoint  DistributionPointName OPTIONAL
--- }
--- 
+
+CertificateListExactAssertion ::= SEQUENCE {
+  issuer             Name,
+--  thisUpdate         Time,
+  distributionPoint  DistributionPointName OPTIONAL
+}
+
 -- certificateListMatch MATCHING-RULE ::= {
 --   SYNTAX  CertificateListAssertion
 --   ID      id-mr-certificateListMatch
 -- }
--- 
--- CertificateListAssertion ::= SEQUENCE {
---   issuer                  Name OPTIONAL,
---   minCRLNumber            [0]  IMPLICIT CRLNumber OPTIONAL,
---   maxCRLNumber            [1]  IMPLICIT CRLNumber OPTIONAL,
---   reasonFlags             ReasonFlags OPTIONAL,
---   dateAndTime             Time OPTIONAL,
---   distributionPoint       [2]  IMPLICIT DistributionPointName OPTIONAL,
---   authorityKeyIdentifier  [3]  IMPLICIT AuthorityKeyIdentifier OPTIONAL
--- }
--- 
+
+CertificateListAssertion ::= SEQUENCE {
+  issuer                  Name OPTIONAL,
+  minCRLNumber            [0]  IMPLICIT CRLNumber OPTIONAL,
+  maxCRLNumber            [1]  IMPLICIT CRLNumber OPTIONAL,
+  reasonFlags             ReasonFlags OPTIONAL,
+--  dateAndTime             Time OPTIONAL,
+  distributionPoint       [2]  IMPLICIT DistributionPointName OPTIONAL,
+  authorityKeyIdentifier  [3]  IMPLICIT AuthorityKeyIdentifier OPTIONAL
+}
+
 -- algorithmIdentifierMatch MATCHING-RULE ::= {
 --   SYNTAX  AlgorithmIdentifier
 --   ID      id-mr-algorithmIdentifierMatch
@@ -516,11 +516,11 @@ BaseCRLNumber ::= CRLNumber
 --   SYNTAX  PkiPathMatchSyntax
 --   ID      id-mr-pkiPathMatch
 -- }
--- 
--- PkiPathMatchSyntax ::= SEQUENCE {firstIssuer  Name,
---                                  lastSubject  Name
--- }
--- 
+
+PkiPathMatchSyntax ::= SEQUENCE {firstIssuer  Name,
+                                 lastSubject  Name
+}
+
 -- Object identifier assignments 
 id-ce-subjectDirectoryAttributes OBJECT IDENTIFIER ::=  {id-ce 9}
  
diff --git a/asn1/x509ce/Makefile b/asn1/x509ce/Makefile
new file mode 100755
index 0000000000..ca6ec71f6d
--- /dev/null
+++ b/asn1/x509ce/Makefile
@@ -0,0 +1,5 @@
+
+../../epan/dissectors/packet-x509ce.c : ../../tools/asn2eth.py CertificateExtensions.asn packet-x509ce-template.c packet-x509ce-template.h x509ce.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf
+	python ../../tools/asn2eth.py -X -b -k -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn
+	cp packet-x509ce.* ../../epan/dissectors
+
diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c
index 5f8c717489..7a6391eeae 100644
--- a/asn1/x509ce/packet-x509ce-template.c
+++ b/asn1/x509ce/packet-x509ce-template.c
@@ -47,11 +47,14 @@
 int proto_x509ce = -1;
 static int hf_x509ce_id_ce_invalidityDate = -1;
 static int hf_x509ce_id_ce_baseUpdateTime = -1;
+static int hf_x509ce_object_identifier_id = -1;
 #include "packet-x509ce-hf.c"
 
 /* Initialize the subtree pointers */
 #include "packet-x509ce-ett.c"
 
+static char object_identifier_id[64]; /*64 chars should be long enough? */
+
 #include "packet-x509ce-fn.c"
 
 
@@ -80,6 +83,10 @@ void proto_register_x509ce(void) {
       { "invalidityDate", "x509ce.id_ce_invalidityDate",
         FT_STRING, BASE_NONE, NULL, 0,
         "invalidityDate", HFILL }},
+    { &hf_x509ce_object_identifier_id, 
+      { "Id", "x509ce.id", FT_STRING, BASE_NONE, NULL, 0,
+	"Object identifier Id", HFILL }},
+			 
 #include "packet-x509ce-hfarr.c"
   };
 
@@ -100,34 +107,8 @@ void proto_register_x509ce(void) {
 
 /*--- proto_reg_handoff_x509ce -------------------------------------------*/
 void proto_reg_handoff_x509ce(void) {
-	register_ber_oid_dissector("2.5.29.9", dissect_AttributesSyntax_PDU, proto_x509ce, "id-ce-subjectDirectoryAttributes");
-	register_ber_oid_dissector("2.5.29.14", dissect_SubjectKeyIdentifier_PDU, proto_x509ce, "id-ce-subjectKeyIdentifier");
-	register_ber_oid_dissector("2.5.29.15", dissect_KeyUsage_PDU, proto_x509ce, "id-ce-keyUsage");
-	register_ber_oid_dissector("2.5.29.16", dissect_PrivateKeyUsagePeriod_PDU, proto_x509ce, "id-ce-privateKeyUsagePeriod");
-	register_ber_oid_dissector("2.5.29.17", dissect_GeneralNames_PDU, proto_x509ce, "id-ce-subjectAltName");
-	register_ber_oid_dissector("2.5.29.18", dissect_GeneralNames_PDU, proto_x509ce, "id-ce-issuerAltName");
-	register_ber_oid_dissector("2.5.29.19", dissect_BasicConstraintsSyntax_PDU, proto_x509ce, "id-ce-basicConstraints");
-	register_ber_oid_dissector("2.5.29.20", dissect_CRLNumber_PDU, proto_x509ce, "id-ce-cRLNumber");
-	register_ber_oid_dissector("2.5.29.21", dissect_CRLReason_PDU, proto_x509ce, "id-ce-reasonCode");
-	register_ber_oid_dissector("2.5.29.23", dissect_HoldInstruction_PDU, proto_x509ce, "id-ce-instructionCode");
+#include "packet-x509ce-dis-tab.c"
 	register_ber_oid_dissector("2.5.29.24", dissect_x509ce_invalidityDate_callback, proto_x509ce, "id-ce-invalidityDate");
-	register_ber_oid_dissector("2.5.29.27", dissect_BaseCRLNumber_PDU, proto_x509ce, "id-ce-deltaCRLIndicator");
-	register_ber_oid_dissector("2.5.29.28", dissect_IssuingDistPointSyntax_PDU, proto_x509ce, "id-ce-issuingDistributionPoint");
-	register_ber_oid_dissector("2.5.29.29", dissect_GeneralNames_PDU, proto_x509ce, "id-ce-certificateIssuer");
-	register_ber_oid_dissector("2.5.29.30", dissect_NameConstraintsSyntax_PDU, proto_x509ce, "id-ce-nameConstraints");
-	register_ber_oid_dissector("2.5.29.31", dissect_CRLDistPointsSyntax_PDU, proto_x509ce, "id-ce-cRLDistributionPoints");
-	register_ber_oid_dissector("2.5.29.32", dissect_CertificatePoliciesSyntax_PDU, proto_x509ce, "id-ce-certificatePolicies");
-	register_ber_oid_dissector("2.5.29.33", dissect_PolicyMappingsSyntax_PDU, proto_x509ce, "id-ce-policyMappings");
-	register_ber_oid_dissector("2.5.29.35", dissect_AuthorityKeyIdentifier_PDU, proto_x509ce, "id-ce-authorityKeyIdentifier");
-	register_ber_oid_dissector("2.5.29.36", dissect_PolicyConstraintsSyntax_PDU, proto_x509ce, "id-ce-policyConstraints");
-	register_ber_oid_dissector("2.5.29.37", dissect_KeyPurposeIDs_PDU, proto_x509ce, "id-ce-extKeyUsage");
-	register_ber_oid_dissector("2.5.29.40", dissect_CRLStreamIdentifier_PDU, proto_x509ce, "id-ce-cRLStreamIdentifier");
-	register_ber_oid_dissector("2.5.29.44", dissect_CRLScopeSyntax_PDU, proto_x509ce, "id-ce-cRLScope");
-	register_ber_oid_dissector("2.5.29.45", dissect_StatusReferrals_PDU, proto_x509ce, "id-ce-statusReferrals");
-	register_ber_oid_dissector("2.5.29.46", dissect_CRLDistPointsSyntax_PDU, proto_x509ce, "id-ce-freshestCRL");
-	register_ber_oid_dissector("2.5.29.47", dissect_OrderedListSyntax_PDU, proto_x509ce, "id-ce-orderedList");
 	register_ber_oid_dissector("2.5.29.51", dissect_x509ce_baseUpdateTime_callback, proto_x509ce, "id-ce-baseUpdateTime");
-	register_ber_oid_dissector("2.5.29.53", dissect_DeltaInformation_PDU, proto_x509ce, "id-ce-deltaInfo");
-	register_ber_oid_dissector("2.5.29.54", dissect_SkipCerts_PDU, proto_x509ce, "id-ce-inhibitAnyPolicy");
 }
 
diff --git a/asn1/x509ce/x509ce-exp.cnf b/asn1/x509ce/x509ce-exp.cnf
new file mode 100644
index 0000000000..0def4ccb3f
--- /dev/null
+++ b/asn1/x509ce/x509ce-exp.cnf
@@ -0,0 +1,110 @@
+#.IMPORT_TAG
+AuthorityKeyIdentifier   BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+KeyIdentifier            BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING
+SubjectKeyIdentifier     BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING
+KeyUsage                 BER_CLASS_UNI BER_UNI_TAG_BITSTRING
+KeyPurposeIDs            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+KeyPurposeId             BER_CLASS_UNI BER_UNI_TAG_OID
+PrivateKeyUsagePeriod    BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CertificatePoliciesSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+PolicyInformation        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+PolicyQualifierInfo      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+PolicyMappingsSyntax     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+GeneralNames             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+GeneralName              BER_CLASS_CON -1/*choice*/
+EDIPartyName             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+AttributesSyntax         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+BasicConstraintsSyntax   BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+NameConstraintsSyntax    BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+GeneralSubtrees          BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+GeneralSubtree           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+BaseDistance             BER_CLASS_UNI BER_UNI_TAG_INTEGER
+PolicyConstraintsSyntax  BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+SkipCerts                BER_CLASS_UNI BER_UNI_TAG_INTEGER
+CRLNumber                BER_CLASS_UNI BER_UNI_TAG_INTEGER
+CRLReason                BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
+HoldInstruction          BER_CLASS_UNI BER_UNI_TAG_OID
+CRLScopeSyntax           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+PerAuthorityScope        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+OnlyCertificateTypes     BER_CLASS_UNI BER_UNI_TAG_BITSTRING
+NumberRange              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+BaseRevocationInfo       BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+StatusReferrals          BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+StatusReferral           BER_CLASS_CON -1/*choice*/
+CRLReferral              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+DeltaRefInfo             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CRLStreamIdentifier      BER_CLASS_UNI BER_UNI_TAG_INTEGER
+OrderedListSyntax        BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
+DeltaInformation         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CRLDistPointsSyntax      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+DistributionPoint        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+DistributionPointName    BER_CLASS_CON -1/*choice*/
+ReasonFlags              BER_CLASS_UNI BER_UNI_TAG_BITSTRING
+IssuingDistPointSyntax   BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+BaseCRLNumber            BER_CLASS_UNI BER_UNI_TAG_INTEGER
+CertificateExactAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CertificateAssertion     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+AltNameType              BER_CLASS_UNI -1/*choice*/
+CertPolicySet            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CertificatePairExactAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CertificatePairAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CertificateListExactAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CertificateListAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+PkiPathMatchSyntax       BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+#.END
+
+#.TYPE_ATTR
+AuthorityKeyIdentifier   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+KeyIdentifier            TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
+SubjectKeyIdentifier     TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
+KeyUsage                 TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
+KeyPurposeIDs            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+KeyPurposeId             TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+PrivateKeyUsagePeriod    TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CertificatePoliciesSyntax TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+PolicyInformation        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+PolicyQualifierInfo      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+PolicyMappingsSyntax     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+GeneralNames             TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+GeneralName              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(GeneralName_vals)  BITMASK = 0
+EDIPartyName             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+AttributesSyntax         TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+BasicConstraintsSyntax   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+NameConstraintsSyntax    TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+GeneralSubtrees          TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+GeneralSubtree           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+BaseDistance             TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+PolicyConstraintsSyntax  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+SkipCerts                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+CRLNumber                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+CRLReason                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(CRLReason_vals)  BITMASK = 0
+HoldInstruction          TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CRLScopeSyntax           TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+PerAuthorityScope        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+OnlyCertificateTypes     TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
+NumberRange              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+BaseRevocationInfo       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+StatusReferrals          TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+StatusReferral           TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(StatusReferral_vals)  BITMASK = 0
+CRLReferral              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+DeltaRefInfo             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CRLStreamIdentifier      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+OrderedListSyntax        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(OrderedListSyntax_vals)  BITMASK = 0
+DeltaInformation         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CRLDistPointsSyntax      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+DistributionPoint        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+DistributionPointName    TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(DistributionPointName_vals)  BITMASK = 0
+ReasonFlags              TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
+IssuingDistPointSyntax   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+BaseCRLNumber            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+CertificateExactAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CertificateAssertion     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+AltNameType              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(AltNameType_vals)  BITMASK = 0
+CertPolicySet            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+CertificatePairExactAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CertificatePairAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CertificateListExactAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CertificateListAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+PkiPathMatchSyntax       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+#.END
+
diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf
index c09509bbb3..443378eb47 100644
--- a/asn1/x509ce/x509ce.cnf
+++ b/asn1/x509ce/x509ce.cnf
@@ -13,42 +13,102 @@ SelectedAttributeTypes x509sat
 #.INCLUDE ../x509sat/x509sat-exp.cnf
 
 #.EXPORTS
-
-GeneralNames
-GeneralName
-
-#.PDU
+AltNameType
 AttributesSyntax
 AuthorityKeyIdentifier
 BaseCRLNumber
+BaseDistance
+BaseRevocationInfo
 BasicConstraintsSyntax
+CertificateAssertion
+CertificateExactAssertion
+CertificateListAssertion
+CertificateListExactAssertion
+CertificatePairAssertion
+CertificatePairExactAssertion
 CertificatePoliciesSyntax
+CertPolicySet
 CRLDistPointsSyntax
 CRLNumber
 CRLReason
+CRLReferral
 CRLScopeSyntax
 CRLStreamIdentifier
 DeltaInformation
+DeltaRefInfo
+DistributionPoint
+DistributionPointName
+EDIPartyName
+GeneralName
 GeneralNames
+GeneralSubtree
+GeneralSubtrees
 HoldInstruction
 IssuingDistPointSyntax
+KeyIdentifier
+KeyPurposeId
 KeyPurposeIDs
 KeyUsage
 NameConstraintsSyntax
+NumberRange
+OnlyCertificateTypes
 OrderedListSyntax
+PerAuthorityScope
+PkiPathMatchSyntax
 PolicyConstraintsSyntax
+PolicyInformation
 PolicyMappingsSyntax
+PolicyQualifierInfo
 PrivateKeyUsagePeriod
+ReasonFlags
 SkipCerts
+StatusReferral
 StatusReferrals
 SubjectKeyIdentifier
 
+#.REGISTER
+AttributesSyntax          B "2.5.29.9"  "id-ce-subjectDirectoryAttributes"
+SubjectKeyIdentifier      B "2.5.29.14" "id-ce-subjectKeyIdentifier"
+KeyUsage                  B "2.5.29.15" "id-ce-keyUsage"
+PrivateKeyUsagePeriod     B "2.5.29.16" "id-ce-privateKeyUsagePeriod"
+GeneralNames              B "2.5.29.17" "id-ce-subjectAltName"
+GeneralNames              B "2.5.29.18" "id-ce-issuerAltName"
+BasicConstraintsSyntax    B "2.5.29.19" "id-ce-basicConstraints"
+CRLNumber                 B "2.5.29.20" "id-ce-cRLNumber"
+CRLReason                 B "2.5.29.21" "id-ce-reasonCode"
+HoldInstruction           B "2.5.29.23" "id-ce-instructionCode"
+BaseCRLNumber             B "2.5.29.27" "id-ce-deltaCRLIndicator"
+IssuingDistPointSyntax    B "2.5.29.28" "id-ce-issuingDistributionPoint"
+GeneralNames              B "2.5.29.29" "id-ce-certificateIssuer"
+NameConstraintsSyntax     B "2.5.29.30" "id-ce-nameConstraints"
+CRLDistPointsSyntax       B "2.5.29.31" "id-ce-cRLDistributionPoints"
+CertificatePoliciesSyntax B "2.5.29.32" "id-ce-certificatePolicies"
+PolicyMappingsSyntax      B "2.5.29.33" "id-ce-policyMappings"
+AuthorityKeyIdentifier    B "2.5.29.35" "id-ce-authorityKeyIdentifier"
+PolicyConstraintsSyntax   B "2.5.29.36" "id-ce-policyConstraints"
+KeyPurposeIDs             B "2.5.29.37" "id-ce-extKeyUsage"
+CRLStreamIdentifier       B "2.5.29.40" "id-ce-cRLStreamIdentifier"
+CRLScopeSyntax            B "2.5.29.44" "id-ce-cRLScope"
+StatusReferrals           B "2.5.29.45" "id-ce-statusReferrals"
+CRLDistPointsSyntax       B "2.5.29.46" "id-ce-freshestCRL"
+OrderedListSyntax         B "2.5.29.47" "id-ce-orderedList"
+DeltaInformation          B "2.5.29.53" "id-ce-deltaInfo"
+SkipCerts                 B "2.5.29.54" "id-ce-inhibitAnyPolicy"
+
 #.NO_EMIT
 
 #.TYPE_RENAME
 
 #.FIELD_RENAME
 
+#.FN_BODY PolicyQualifierId
+  offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
+                                         hf_x509ce_object_identifier_id, object_identifier_id);
+
+#.FN_BODY PolicyQualifierValue
+  offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
+
+
 #.END
 
 
diff --git a/asn1/x509ce/x509ce_exp.cnf b/asn1/x509ce/x509ce_exp.cnf
deleted file mode 100644
index 923bf58bbc..0000000000
--- a/asn1/x509ce/x509ce_exp.cnf
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#.IMPORT_TAG
-GeneralNames     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-GeneralName	 BER_CLASS_ANY -1