Changeset 7338 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

Timestamp:

2014-07-27T14:21:14+02:00 (10 years ago)

Author:

Don-vip

Message:

see #10230, see #10033 - JDK8 compatibility

File:

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

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

@@ -136 +136 @@
         info.set(X509CertInfo.VALIDITY, interval);
         info.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(sn));
-        info.set(X509CertInfo.SUBJECT, new CertificateSubjectName(owner));
-        info.set(X509CertInfo.ISSUER, new CertificateIssuerName(owner));
+
+        // Change of behaviour in JDK8:
+        // https://bugs.openjdk.java.net/browse/JDK-8040820
+        // https://bugs.openjdk.java.net/browse/JDK-7198416
+        String version = System.getProperty("java.version");
+        if (version == null || version.matches("^(1\\.)?[7].*")) {
+            // Java 7 code. To remove with Java 8 migration
+            info.set(X509CertInfo.SUBJECT, new CertificateSubjectName(owner));
+            info.set(X509CertInfo.ISSUER, new CertificateIssuerName(owner));
+        } else {
+            // Java 8 and later code
+            info.set(X509CertInfo.SUBJECT, owner);
+            info.set(X509CertInfo.ISSUER, owner);
+        }
+
         info.set(X509CertInfo.KEY, new CertificateX509Key(pair.getPublic()));
         info.set(X509CertInfo.VERSION, new CertificateVersion(CertificateVersion.V3));
@@ -203 +216 @@
 
                     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);
+                            "dns:localhost,ip:127.0.0.1,ip:::1,uri:https://127.0.0.1:"+HTTPS_PORT+",uri:https://::1:"+HTTPS_PORT);
 
                     KeyStore ks = KeyStore.getInstance("JKS");