From c047d48d91c91eea6654b7556fc1c1706c2a48b7 Mon Sep 17 00:00:00 2001 From: Peter Hicks Date: Tue, 30 Jan 2024 09:08:46 +0000 Subject: [PATCH] Merge pull request #1813 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * OSM Tileserver now supports TLSv1.3, so we should use this in prefere… --- .../org/jdesktop/swingx/mapviewer/AbstractTileFactory.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java b/src/main/java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java index 8dc588cd..7e7e14cc 100644 --- a/src/main/java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java +++ b/src/main/java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java @@ -416,8 +416,7 @@ public abstract class AbstractTileFactory extends TileFactory try { - //Java 13 uses TLSv1.3 by default and fails to connect to tile server, so force TLS 1.2 - SSLContext sslContext = SSLContext.getInstance("TLSv1.2"); + SSLContext sslContext = SSLContext.getInstance("TLSv1.3"); sslContext.init(null, null, new SecureRandom()); conn.setSSLSocketFactory(sslContext.getSocketFactory()); } @@ -427,7 +426,7 @@ public abstract class AbstractTileFactory extends TileFactory } catch(NoSuchAlgorithmException nsae) { - mLog.error("Unable to use TLSv1.2 for openstreetmap tiles"); + mLog.error("Unable to use TLSv1.3 for OpenStreetMap tiles"); } InputStream is = conn.getInputStream();