Update x509SAT to export DirectoryString.

Update X509CE to dissect EDIPartyName now that DirectoryString can be dissected


svn path=/trunk/; revision=11910

1 files changed, 8 insertions, 8 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