Changeset 14999 in josm for trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
- Timestamp:
- 2019-04-19T01:07:53+02:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
r14622 r14999 87 87 import org.openstreetmap.josm.gui.MainApplication; 88 88 import org.openstreetmap.josm.io.CertificateAmendment.NativeCertAmend; 89 import org.openstreetmap.josm.io.NetworkManager; 90 import org.openstreetmap.josm.io.OnlineResource; 89 91 import org.openstreetmap.josm.spi.preferences.Config; 90 92 … … 479 481 // Search by alias (fast) 480 482 Certificate result = ks.getCertificate(certAmend.getWinAlias()); 481 if (result == null ) {483 if (result == null && !NetworkManager.isOffline(OnlineResource.CERTIFICATES)) { 482 484 // Make a web request to target site to force Windows to update if needed its trust root store from its certificate trust list 483 485 // A better, but a lot more complex method might be to get certificate list from Windows Registry with PowerShell … … 495 497 MessageDigest md = MessageDigest.getInstance("SHA-256"); 496 498 for (Enumeration<String> aliases = ks.aliases(); aliases.hasMoreElements();) { 497 result = ks.getCertificate(aliases.nextElement()); 499 String alias = aliases.nextElement(); 500 result = ks.getCertificate(alias); 498 501 if (result instanceof X509Certificate 499 502 && certAmend.getSha256().equalsIgnoreCase(Utils.toHexString(md.digest(result.getEncoded())))) { 503 Logging.warn("Certificate not found for alias ''{0}'' but found for alias ''{1}''", certAmend.getWinAlias(), alias); 500 504 return (X509Certificate) result; 501 505 }
Note:
See TracChangeset
for help on using the changeset viewer.