5 files changed, 14 insertions, 10 deletions
diff --git a/asn1/x509ce/CertificateExtensions.asn b/asn1/x509ce/CertificateExtensions.asn
index 06f8bb6b05..d8ab1b7ca1 100644
--- a/asn1/x509ce/CertificateExtensions.asn
+++ b/asn1/x509ce/CertificateExtensions.asn
@@ -16,7 +16,7 @@ IMPORTS
     Time, PolicyID
     FROM AuthenticationFramework {joint-iso-itu-t ds(5) module(1)
       authenticationFramework(7) 4}
-  DirectoryString{}
+  DirectoryString
     FROM SelectedAttributeTypes {joint-iso-itu-t ds(5) module(1)
       selectedAttributeTypes(5) 4}
   ub-name
@@ -150,19 +150,19 @@ GeneralName ::= CHOICE {
   dNSName                    [2]  IMPLICIT IA5String,
 --  x400Address                [3]  IMPLICIT ORAddress,
   directoryName              [4]  IMPLICIT Name,
---  ediPartyName               [5]  IMPLICIT EDIPartyName,
+  ediPartyName               [5]  IMPLICIT EDIPartyName,
   uniformResourceIdentifier  [6]  IMPLICIT IA5String,
   iPAddress                  [7]  IMPLICIT OCTET STRING,
   registeredID               [8]  IMPLICIT OBJECT IDENTIFIER
 }
 
 -- OTHER-NAME ::= TYPE-IDENTIFIER
--- 
--- EDIPartyName ::= SEQUENCE {
---   nameAssigner  [0]  IMPLICIT DirectoryString{ub-name} OPTIONAL,
---   partyName     [1]  IMPLICIT DirectoryString{ub-name}
--- }
--- 
+
+EDIPartyName ::= SEQUENCE {
+  nameAssigner  [0]  IMPLICIT DirectoryString OPTIONAL,
+  partyName     [1]  IMPLICIT DirectoryString
+}
+
 -- issuerAltName EXTENSION ::= {
 --   SYNTAX         GeneralNames
 --   IDENTIFIED BY  id-ce-issuerAltName
diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf
index 56cb5ca4f9..fb0df7a8e0 100644
--- a/asn1/x509ce/x509ce.cnf
+++ b/asn1/x509ce/x509ce.cnf
@@ -6,9 +6,11 @@
 #.MODULE_IMPORT
 InformationFramework x509if
 AuthenticationFramework x509af
+SelectedAttributeTypes x509sat
 
 #.INCLUDE ../x509if/x509if_exp.cnf
 #.INCLUDE ../x509af/x509af_exp.cnf
+#.INCLUDE ../x509sat/x509sat_exp.cnf
 
 #.EXPORTS
 
diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c
index d06c24ddde..fd68d6daf1 100644
--- a/asn1/x509sat/packet-x509sat-template.c
+++ b/asn1/x509sat/packet-x509sat-template.c
@@ -135,7 +135,7 @@ static ber_choice DirectoryString_choice[] = {
   { 0, 0, 0, 0, NULL }
 };
 
-static int
+int
 dissect_x509sat_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index) {
   DirectoryString_hf_index = hf_index;
   offset = dissect_ber_choice(pinfo, tree, tvb, offset,
diff --git a/asn1/x509sat/packet-x509sat-template.h b/asn1/x509sat/packet-x509sat-template.h
index 4c62b7deec..8b820c485c 100644
--- a/asn1/x509sat/packet-x509sat-template.h
+++ b/asn1/x509sat/packet-x509sat-template.h
@@ -27,5 +27,7 @@
 
 #include "packet-x509sat-exp.h"
 
+int dissect_x509sat_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+
 #endif  /* PACKET_X509SAT_H */
 
diff --git a/asn1/x509sat/x509sat_exp.cnf b/asn1/x509sat/x509sat_exp.cnf
index ed8c43f443..e091fddeff 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