aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/security
diff options
context:
space:
mode:
authorAndreas Tobler <andreast@gcc.gnu.org>2004-09-21 17:30:20 +0200
committerAndreas Tobler <andreast@gcc.gnu.org>2004-09-21 17:30:20 +0200
commitf1b1846249458e8b583b407f674fec541c4f6869 (patch)
treebc309268f61548dfd2fd03375ad799b9964d2e6e /libjava/java/security
parent9413382eec489236a06827e7dbff33975b249bb1 (diff)
downloadgcc-f1b1846249458e8b583b407f674fec541c4f6869.zip
gcc-f1b1846249458e8b583b407f674fec541c4f6869.tar.gz
gcc-f1b1846249458e8b583b407f674fec541c4f6869.tar.bz2
2004-09-21 Casey Marshall <csm@gnu.org>
* java/security/cert/X509CRLSelector.java: (match): remove unreachable try-catch clauses. Reported by: Dalibor Topic <robilad@kaffe.org> From-SVN: r87805
Diffstat (limited to 'libjava/java/security')
-rw-r--r--libjava/java/security/cert/X509CRLSelector.java56
1 files changed, 21 insertions, 35 deletions
diff --git a/libjava/java/security/cert/X509CRLSelector.java b/libjava/java/security/cert/X509CRLSelector.java
index 3264e46..a59791e 100644
--- a/libjava/java/security/cert/X509CRLSelector.java
+++ b/libjava/java/security/cert/X509CRLSelector.java
@@ -378,8 +378,27 @@ public class X509CRLSelector implements CRLSelector, Cloneable
BigInteger crlNumber = null;
if (maxCrlNumber != null)
{
+ byte[] b = crl.getExtensionValue(CRL_NUMBER_ID);
+ if (b == null)
+ return false;
try
{
+ DERValue val = DERReader.read(b);
+ if (!(val.getValue() instanceof BigInteger))
+ return false;
+ crlNumber = (BigInteger) val.getValue();
+ }
+ catch (IOException ioe)
+ {
+ return false;
+ }
+ if (maxCrlNumber.compareTo(crlNumber) < 0)
+ return false;
+ }
+ if (minCrlNumber != null)
+ {
+ if (crlNumber == null)
+ {
byte[] b = crl.getExtensionValue(CRL_NUMBER_ID);
if (b == null)
return false;
@@ -394,42 +413,9 @@ public class X509CRLSelector implements CRLSelector, Cloneable
{
return false;
}
- if (maxCrlNumber.compareTo(crlNumber) < 0)
- return false;
- }
- catch (CertificateParsingException cpe)
- {
- return false;
- }
- }
- if (minCrlNumber != null)
- {
- try
- {
- if (crlNumber == null)
- {
- byte[] b = crl.getExtensionValue(CRL_NUMBER_ID);
- if (b == null)
- return false;
- try
- {
- DERValue val = DERReader.read(b);
- if (!(val.getValue() instanceof BigInteger))
- return false;
- crlNumber = (BigInteger) val.getValue();
- }
- catch (IOException ioe)
- {
- return false;
- }
- }
- if (minCrlNumber.compareTo(crlNumber) > 0)
- return false;
- }
- catch (CertificateParsingException cpe)
- {
- return false;
}
+ if (minCrlNumber.compareTo(crlNumber) > 0)
+ return false;
}
if (date != null)
{