[cp-patches] Re: Patch: RFC: X509 parsing fix

[Tom Tromey]

>>>>> "Tom" == Tom Tromey <address@hidden> writes:

Tom> I've been looking at this bug:
Tom> https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174708

Tom> I'll check this in to Classpath on Monday, barring objection.

I'm checking in a slightly different version, which fixes the
imports.  Appended.

Tom

2006-01-23  Tom Tromey  <address@hidden>

        * gnu/java/security/x509/X509Certificate.java (parse):
        Unconditionally read value; for version==1 case when reading
        algorithm ID.

Index: gnu/java/security/x509/X509Certificate.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/security/x509/X509Certificate.java,v
retrieving revision 1.9
diff -u -r1.9 X509Certificate.java
--- gnu/java/security/x509/X509Certificate.java 10 Jul 2005 19:08:02 -0000      
1.9
+++ gnu/java/security/x509/X509Certificate.java 23 Jan 2006 15:38:37 -0000
@@ -40,7 +40,6 @@
 
 import gnu.classpath.debug.Component;
 import gnu.classpath.debug.SystemLogger;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.BitString;
 import gnu.java.security.der.DER;
@@ -88,8 +87,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.security.auth.x500.X500Principal;
@@ -661,10 +658,7 @@
     der.skip(spki.getLength());
     logger.log (Component.X509, "read subjectPublicKey == {0}", subjectKey);
 
-    if (version > 1)
-      {
-        val = der.read();
-      }
+    val = der.read();
     if (version >= 2 && val.getTagClass() != DER.UNIVERSAL && val.getTag() == 
1)
       {
         byte[] b = (byte[]) val.getValue();