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

Timestamp:

2017-07-08T22:11:07+02:00 (7 years ago)

Author:

Don-vip

Message:

see #10033 - remove workaround for IE (not needed anymore for IE11 on Windows 10, works also for Edge)

Location:

trunk/src/org/openstreetmap/josm/io/remotecontrol

Files:

• DNSNameFix.java (deleted)
• RemoteControlHttpsServer.java (modified) (5 diffs)

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

@@ -51 +51 @@
 import sun.security.x509.CertificateVersion;
 import sun.security.x509.CertificateX509Key;
+import sun.security.x509.DNSName;
 import sun.security.x509.ExtendedKeyUsageExtension;
 import sun.security.x509.GeneralName;
@@ -109 +110 @@
 
     /**
-     * Creates a GeneralName object from known types.
+     * Creates a GeneralNameInterface object from known types.
      * @param t one of 4 known types
      * @param v value
@@ -115 +116 @@
      * @throws IOException if any I/O error occurs
      */
-    private static GeneralName createGeneralName(String t, String v) throws IOException {
-        GeneralNameInterface gn;
+    private static GeneralNameInterface createGeneralNameInterface(String t, String v) throws IOException {
         switch (t.toLowerCase(Locale.ENGLISH)) {
-            case "uri": gn = new URIName(v); break;
-            case "dns": gn = new DNSNameFix(v); break;
-            case "ip": gn = new IPAddressName(v); break;
-            default: gn = new OIDName(v);
-        }
-        return new GeneralName(gn);
+            case "uri": return new URIName(v);
+            case "dns": return new DNSName(v);
+            case "ip": return new IPAddressName(v);
+            default: return new OIDName(v);
+        }
     }
 
@@ -174 +173 @@
                 String t = item.substring(0, colonpos);
                 String v = item.substring(colonpos+1);
-                gnames.add(createGeneralName(t, v));
+                gnames.add(new GeneralName(createGeneralNameInterface(t, v)));
             }
             // Non critical
@@ -220 +219 @@
 
             X509Certificate cert = generateCertificate("CN=localhost, OU=JOSM, O=OpenStreetMap", pair, 1825, "SHA256withRSA",
-                    // see #10033#comment:20: All browsers respect "ip" in SAN, except IE which only understands DNS entries:
-                    // CHECKSTYLE.OFF: LineLength
-                    // https://connect.microsoft.com/IE/feedback/details/814744/the-ie-doesnt-trust-a-san-certificate-when-connecting-to-ip-address
-                    // CHECKSTYLE.ON: LineLength
-                    "dns:localhost,ip:127.0.0.1,dns:127.0.0.1,ip:::1,uri:https://127.0.0.1:"+HTTPS_PORT+",uri:https://::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");