Changeset 13693 in josm for trunk

Timestamp:

2018-05-01T15:58:03+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #15851 - search certificates in /etc/ssl/certs

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -402 +402 @@
     public X509Certificate getX509Certificate(NativeCertAmend certAmend)
             throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
-        File f = new File("/usr/share/ca-certificates/mozilla", certAmend.getFilename());
-        if (f.exists()) {
-            CertificateFactory fact = CertificateFactory.getInstance("X.509");
-            try (InputStream is = Files.newInputStream(f.toPath())) {
-                return (X509Certificate) fact.generateCertificate(is);
+        for (String dir : new String[] {"/etc/ssl/certs", "/usr/share/ca-certificates/mozilla"}) {
+            File f = new File(dir, certAmend.getFilename());
+            if (f.exists()) {
+                CertificateFactory fact = CertificateFactory.getInstance("X.509");
+                try (InputStream is = Files.newInputStream(f.toPath())) {
+                    return (X509Certificate) fact.generateCertificate(is);
+                }
             }
         }