[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: X509Certificate parsing fix

[Kaffe CVS]

PatchSet 5854 
Date: 2005/01/13 11:21:47
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: X509Certificate parsing fix

2005-01-13  Dalibor Topic  <robilad at kaffe.org>

Resynced with GNU Classpath.

2005-01-12  Michael Koch  <konqueror at gmx.de>

* gnu/java/security/x509/X509Certificate.java
(parse): Handle val == null case.

Members: 
	ChangeLog:1.3398->1.3399 
	libraries/javalib/gnu/java/security/x509/X509Certificate.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3398 kaffe/ChangeLog:1.3399
--- kaffe/ChangeLog:1.3398	Thu Jan 13 11:16:29 2005
+++ kaffe/ChangeLog	Thu Jan 13 11:21:47 2005
@@ -4,6 +4,15 @@
 	
 	2005-01-12  Michael Koch  <konqueror at gmx.de>
 
+	* gnu/java/security/x509/X509Certificate.java
+	(parse): Handle val == null case.
+	
+2005-01-13  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+	
+	2005-01-12  Michael Koch  <konqueror at gmx.de>
+
 	* java/nio/channels/Channels.java
 	(newInputStream(ReadableByteChannel)):
 	Call VMChannels.newInputStream(ReadableByteChannel).
Index: kaffe/libraries/javalib/gnu/java/security/x509/X509Certificate.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/X509Certificate.java:1.2 kaffe/libraries/javalib/gnu/java/security/x509/X509Certificate.java:1.3
--- kaffe/libraries/javalib/gnu/java/security/x509/X509Certificate.java:1.2	Wed Nov 10 22:46:25 2004
+++ kaffe/libraries/javalib/gnu/java/security/x509/X509Certificate.java	Thu Jan 13 11:21:48 2005
@@ -624,10 +624,9 @@
         else
           {
             algVal = val.getEncoded();
-          }
-        if (val.isConstructed())
-          {
-            encoded.skip(val.getLength());
+	    
+	    if (val.isConstructed())
+	      encoded.skip(val.getLength());
           }
         debug("read algorithm parameters == " + algVal);
       }