aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/gnu/java/security/x509/X509Certificate.java7
2 files changed, 8 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7b78f97..6ab56c5 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-19 Michael Koch <konqueror@gmx.de>
+
+ * gnu/java/security/x509/X509Certificate.java
+ (parse): Handle val == null case.
+
2005-04-19 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/metal/MetalLookAndFeel.java
diff --git a/libjava/gnu/java/security/x509/X509Certificate.java b/libjava/gnu/java/security/x509/X509Certificate.java
index 29606d1..5d8f1d9 100644
--- a/libjava/gnu/java/security/x509/X509Certificate.java
+++ b/libjava/gnu/java/security/x509/X509Certificate.java
@@ -622,10 +622,9 @@ public class X509Certificate extends java.security.cert.X509Certificate
else
{
algVal = val.getEncoded();
- }
- if (val.isConstructed())
- {
- encoded.skip(val.getLength());
+
+ if (val.isConstructed())
+ encoded.skip(val.getLength());
}
debug("read algorithm parameters == " + algVal);
}