Changeset 9995 in josm

Timestamp:

2016-03-14T22:15:51+01:00 (9 years ago)

Author:

bastiK

Message:

fixed #12264 - Add own CA's to Java cert-store

Location:

trunk

Files:

• data/security (added)
• data/security/DST_Root_CA_X3.pem (added)
• data/security/StartCom_Certification_Authority.pem (added)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/CachedFile.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/CertificateAmendment.java (added)
• test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java (added)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -58 +58 @@
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.CertificateAmendment;
 import org.openstreetmap.josm.io.DefaultProxySelector;
 import org.openstreetmap.josm.io.MessageNotifier;
@@ -401 +402 @@
         }
 
+        try {
+            CertificateAmendment.addMissingCertificates();
+        } catch (IOException ex) {
+            ex.printStackTrace();
+            Main.warn(getErrorMessage(Utils.getRootCause(ex)));
+        }
         Authenticator.setDefault(DefaultAuthenticator.getInstance());
         DefaultProxySelector proxySelector = new DefaultProxySelector(ProxySelector.getDefault());

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -6 +6 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
@@ -213 +214 @@
 
     /**
+     * Get the full content of the requested resource as a byte array.
+     * @return the full content of the requested resource as byte array
+     * @throws IOException in case of an I/O error
+     */
+    public byte[] getByteContent() throws IOException {
+        try (InputStream is = getInputStream()) {
+            ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+            int nRead;
+            byte[] data = new byte[8192];
+            while ((nRead = is.read(data, 0, data.length)) != -1) {
+                buffer.write(data, 0, nRead);
+            }
+            buffer.flush();
+            return buffer.toByteArray();
+        }
+    }
+
+    /**
      * Returns {@link #getInputStream()} wrapped in a buffered reader.
      * <p>