From 3ee948c9f92d95d35566fbb9682a602b0ebb97f6 Mon Sep 17 00:00:00 2001 From: "taylor.smock" Date: Mon, 29 Jul 2024 19:17:15 +0000 Subject: [PATCH] See #14649: Drop certificate amendment for Netherlands www.nationaalgeoregister.nl is properly setup to have the trust chain and uses QuoVadis Root CA 2, which is in the default Java trust store. Furthermore, `geodata.nationaalgeoregister.nl` is no longer a registered subdomain. In addition, our map backgrounds make no references to that subdomain. git-svn-id: https://josm.openstreetmap.de/svn/trunk@19158 0c6e7542-c601-0410-84e7-c038aed88b3b --- src/org/openstreetmap/josm/io/CertificateAmendment.java | 5 ----- .../openstreetmap/josm/io/CertificateAmendmentTestIT.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/org/openstreetmap/josm/io/CertificateAmendment.java b/src/org/openstreetmap/josm/io/CertificateAmendment.java index 5922c9f7eb2..429e73f4273 100644 --- a/src/org/openstreetmap/josm/io/CertificateAmendment.java +++ b/src/org/openstreetmap/josm/io/CertificateAmendment.java @@ -157,11 +157,6 @@ public String toString() { * */ private static final NativeCertAmend[] PLATFORM_CERT_AMEND = { - // #14649 - Government of Netherlands - for PDOK aerial imagery at ​https://geodata.nationaalgeoregister.nl (expires 2028) - new NativeCertAmend(Arrays.asList("Government of Netherlands G3", "Staat der Nederlanden Root CA - G3"), - "Staat_der_Nederlanden_Root_CA_-_G3.crt", - "3c4fb0b95ab8b30032f432b86f535fe172c185d0fd39865837cf36187fa6f428", - "https://roottest-g3.pkioverheid.nl"), // #15178 - Trusted and used by French Government - for cadastre - https://www.certigna.fr/autorites/index.xhtml?ac=Racine#lracine // (expires 2027, should be in Java 21) new NativeCertAmend(Collections.singleton("Certigna"), diff --git a/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTestIT.java b/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTestIT.java index baaac538c4e..085f99cf541 100644 --- a/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTestIT.java +++ b/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTestIT.java @@ -74,7 +74,7 @@ void testOverpass() throws IOException { */ @Test void testDutchGovernment() throws IOException { - connect("https://geodata.nationaalgeoregister.nl", true); + connect("https://www.nationaalgeoregister.nl", true); } /**