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/ca-certificates.spec b/ca-certificates.spec index f00b532..0c4e2ad 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -33,7 +33,7 @@ Name: ca-certificates License: GPLv2+ Group: Productivity/Networking/Security Version: 1 -Release: 5 +Release: 8 Summary: Utilities for system wide CA certificate installation Source0: update-ca-certificates Source1: update-ca-certificates.8 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;