Changeset 7337 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2014-07-26T16:36:43+02:00 (11 years ago)

Author:

Don-vip

Message:

see #10230, see #10033 - SAN tweaks + fix unit test (for real?)

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

@@ -79 +79 @@
     private SSLContext sslContext;
 
-    private static final String KEYSTORE_FILENAME = "josm.keystore";
+    private static final int HTTPS_PORT = 8112;
+
+    /**
+     * JOSM keystore file name.
+     * @since 7337
+     */
+    public static final String KEYSTORE_FILENAME = "josm.keystore";
 
     /**
@@ -196 +202 @@
                     KeyPair pair = generator.generateKeyPair();
 
-                    X509Certificate cert = generateCertificate("CN=localhost, OU=JOSM, O=OpenStreetMap", pair, 1825, "SHA256withRSA", "ip:127.0.0.1");
+                    X509Certificate cert = generateCertificate("CN=localhost, OU=JOSM, O=OpenStreetMap", pair, 1825, "SHA256withRSA",
+                            "ip:127.0.0.1,dns:localhost,uri:https://127.0.0.1:"+HTTPS_PORT);
 
                     KeyStore ks = KeyStore.getInstance("JKS");
@@ -255 +262 @@
      */
     public static void restartRemoteControlHttpsServer() {
-        int port = Main.pref.getInteger("remote.control.https.port", 8112);
+        int port = Main.pref.getInteger("remote.control.https.port", HTTPS_PORT);
         try {
             stopRemoteControlHttpsServer();