Subject: [PATCH] Fix #22904: Remove expired/unnecessary certificates from CertificateAmendment
---
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/io/CertificateAmendment.java b/src/org/openstreetmap/josm/io/CertificateAmendment.java
a
|
b
|
|
157 | 157 | * </ul> |
158 | 158 | */ |
159 | 159 | private static final NativeCertAmend[] PLATFORM_CERT_AMEND = { |
160 | | // Let's Encrypt - should be included in JDK, but problems with Ubuntu 18.04, see #15851 |
161 | | new NativeCertAmend(Collections.singleton("DST Root CA X3"), |
162 | | "DST_Root_CA_X3.pem", |
163 | | "0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739", |
164 | | "https://acme-v02.api.letsencrypt.org"), |
165 | | // #19872 - Government of Netherlands - for PDOK aerial imagery at https://geodata.nationaalgeoregister.nl |
166 | | new NativeCertAmend(Collections.singleton("Staat der Nederlanden EV Root CA"), |
167 | | "Staat_der_Nederlanden_EV_Root_CA.crt", |
168 | | "4d2491414cfe956746ec4cefa6cf6f72e28a1329432f9d8a907ac4cb5dadc15a", |
169 | | "https://roottest-ev.pkioverheid.nl"), |
170 | | // #14649 - Government of Netherlands - for PDOK aerial imagery at https://geodata.nationaalgeoregister.nl |
| 160 | // #14649 - Government of Netherlands - for PDOK aerial imagery at https://geodata.nationaalgeoregister.nl (expires 2028) |
171 | 161 | new NativeCertAmend(Arrays.asList("Government of Netherlands G3", "Staat der Nederlanden Root CA - G3"), |
172 | 162 | "Staat_der_Nederlanden_Root_CA_-_G3.crt", |
173 | 163 | "3c4fb0b95ab8b30032f432b86f535fe172c185d0fd39865837cf36187fa6f428", |
174 | 164 | "https://roottest-g3.pkioverheid.nl"), |
175 | 165 | // #15178 - Trusted and used by French Government - for cadastre - https://www.certigna.fr/autorites/index.xhtml?ac=Racine#lracine |
| 166 | // (expires 2027, should be in Java 21) |
176 | 167 | new NativeCertAmend(Collections.singleton("Certigna"), |
177 | 168 | "Certigna.crt", |
178 | 169 | "e3b6a2db2ed7ce48842f7ac53241c7b71d54144bfb40c11f3f1d0b42f5eea12d", |
179 | 170 | "https://www.certigna.fr"), |
180 | | // #16307 - Trusted and used by Slovakian Government - https://eidas.disig.sk/en/cacert/ |
| 171 | // #16307 - Trusted and used by Slovakian Government - https://eidas.disig.sk/en/cacert/ (expires 2042) |
181 | 172 | new NativeCertAmend(Collections.singleton("CA Disig Root R2"), |
182 | 173 | "CA_Disig_Root_R2.pem", |
183 | 174 | "e23d4a036d7b70e9f595b1422079d2b91edfbb1fb651a0633eaa8a9dc5f80703", |
184 | 175 | "https://eidas.disig.sk"), |
185 | | // #17062 - Government of Taiwan - for https://data.gov.tw/license - https://grca.nat.gov.tw/GRCAeng/index.html |
| 176 | // #17062 - Government of Taiwan - for https://data.gov.tw/license - https://grca.nat.gov.tw/GRCAeng/index.html (expires 2032) |
186 | 177 | new NativeCertAmend(Arrays.asList("TW Government Root Certification Authority", "Government Root Certification Authority"), |
187 | 178 | "Taiwan_GRCA.pem", |
188 | 179 | "7600295eefe85b9e1fd624db76062aaaae59818a54d2774cd4c0b2c01131e1b3", |
189 | 180 | "https://grca.nat.gov.tw"), |
190 | | // #17668 - used by city of Budapest - for https://terinfo.ujbuda.hu - https://e-szigno.hu/ |
| 181 | // #17668 - used by city of Budapest - for https://terinfo.ujbuda.hu - https://e-szigno.hu/ (expires 2029) |
191 | 182 | new NativeCertAmend(Collections.singleton("MicroSec e-Szigno Root CA 2009"), |
192 | 183 | "Microsec_e-Szigno_Root_CA_2009.pem", |
193 | 184 | "3c5f81fea5fab82c64bfa2eaecafcde8e077fc8620a7cae537163df36edbf378", |
194 | 185 | "https://e-szigno.hu"), |
195 | | // #18920 - Spanish Government - https://www.sede.fnmt.gob.es/descargas/certificados-raiz-de-la-fnmt |
| 186 | // #18920 - Spanish Government - https://www.sede.fnmt.gob.es/descargas/certificados-raiz-de-la-fnmt (expires 2030) |
196 | 187 | new NativeCertAmend(Collections.singleton("AC RAIZ FNMT-RCM"), |
197 | 188 | "AC_RAIZ_FNMT-RCM.pem", |
198 | 189 | "ebc5570c29018c4d67b1aa127baf12f703b4611ebc17b7dab5573894179b93fa", |