From b6f9b628c7fd141624f7f1d2cff1e01c2d0fbdd8ffebaf863750df130cccae5b Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 27 Sep 2010 14:58:22 +0000 Subject: [PATCH] - catch FileNotFoundException (bnc#623365) OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates?expand=0&rev=18 --- ca-certificates.changes | 5 +++++ keystore.java | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ca-certificates.changes b/ca-certificates.changes index 75e3ca7..dbfcbb3 100644 --- a/ca-certificates.changes +++ b/ca-certificates.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 27 14:58:03 UTC 2010 - lnussel@suse.de + +- catch FileNotFoundException (bnc#623365) + ------------------------------------------------------------------- Fri May 21 12:46:55 UTC 2010 - mvyskocil@suse.cz diff --git a/keystore.java b/keystore.java index 34ca526..c60c491 100644 --- a/keystore.java +++ b/keystore.java @@ -51,7 +51,6 @@ public class keystore throws java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.cert.CertificateException, - java.io.FileNotFoundException, java.io.IOException { char[] password = null; @@ -149,7 +148,13 @@ public class keystore int removed = 0; for (int i = 0; i < certs.length; ++i) { - BufferedInputStream f = new BufferedInputStream(new FileInputStream(cadirname+"/"+certs[i])); + BufferedInputStream f; + try { + f = new BufferedInputStream(new FileInputStream(cadirname+"/"+certs[i])); + } catch (java.io.FileNotFoundException ex) { + System.err.println("skipping " + certs[i] + ": file not found"); + continue; + } String marker = "-----BEGIN CERTIFICATE-----"; boolean found = false;