diff options
| author | Casey Marshall <csm@gnu.org> | 2006-02-02 07:16:22 +0000 |
|---|---|---|
| committer | Casey Marshall <csm@gnu.org> | 2006-02-02 07:16:22 +0000 |
| commit | 4bb355c318a3a4e343c64a5a78ca498c3adf86cd (patch) | |
| tree | 23e9f888e5a3d00331afa6de6bce88b7b69257a2 /gnu/java/security/x509/ext | |
| parent | 74ff5e9c98f8009788ac6d3a76957e7dc9fd3a0e (diff) | |
| download | classpath-4bb355c318a3a4e343c64a5a78ca498c3adf86cd.tar.gz | |
2006-02-01 Casey Marshall <csm@gnu.org>
Tag check and OTHER_NAME fixes suggested by ???.
* gnu/java/security/x509/ext/GeneralNames.java (<init>): fix tag
check; fix OTHER_NAME parsing; fix DIRECTORY_NAME parsing.
Diffstat (limited to 'gnu/java/security/x509/ext')
| -rw-r--r-- | gnu/java/security/x509/ext/GeneralNames.java | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/gnu/java/security/x509/ext/GeneralNames.java b/gnu/java/security/x509/ext/GeneralNames.java index e92aedaef..dae94cd9f 100644 --- a/gnu/java/security/x509/ext/GeneralNames.java +++ b/gnu/java/security/x509/ext/GeneralNames.java @@ -52,6 +52,8 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import javax.security.auth.x500.X500Principal; + public class GeneralNames { @@ -81,12 +83,14 @@ public class GeneralNames if (!nameList.isConstructed()) throw new IOException("malformed GeneralNames"); int len = 0; + int i = 0; while (len < nameList.getLength()) { DERValue name = der.read(); List namePair = new ArrayList(2); - if (name.getTagClass() != DER.APPLICATION) - throw new IOException("malformed GeneralName"); + int tagClass = name.getTagClass(); + if (tagClass != DER.CONTEXT) + throw new IOException("malformed GeneralName: Tag class is " + tagClass); namePair.add(new Integer(name.getTag())); DERValue val = null; switch (name.getTag()) @@ -99,6 +103,15 @@ public class GeneralNames break; case OTHER_NAME: + // MUST return the encoded bytes of the OID/OctetString sequence + byte[] anotherName = name.getEncoded(); + anotherName[0] = (byte) (DER.CONSTRUCTED|DER.SEQUENCE); + namePair.add(anotherName); + // DERReader goes back on Constructed things so we need to skip over them + DERValue skip = der.read(); // skip OID + skip = der.read(); // skip Octet String + break; + case EDI_PARTY_NAME: namePair.add(name.getValue()); break; @@ -106,7 +119,9 @@ public class GeneralNames case DIRECTORY_NAME: byte[] b = name.getEncoded(); b[0] = (byte) (DER.CONSTRUCTED|DER.SEQUENCE); - namePair.add(new X500DistinguishedName(b).toString()); + DERReader r = new DERReader (b); + r.read (); + namePair.add(new X500Principal(r.read ().getEncoded ()).toString()); break; case IP_ADDRESS: |