From ac78b69ec2189bb6296e352d435ab39473b944cc Mon Sep 17 00:00:00 2001
From: huanghongxun <i@huangyuhui.net>
Date: Thu, 21 Oct 2021 22:42:59 +0800
Subject: [PATCH] fix: Update Lets Encrypt root certificate.

---
 .../main/java/org/jackhuang/hmcl/Main.java    |  29 +-----------------
 HMCL/src/main/resources/assets/lekeystore.jks | Bin 2347 -> 1453 bytes
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java
index b31a07141..0189c7434 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java
@@ -61,10 +61,7 @@ public final class Main {
         checkDirectoryPath();
 
         // This environment check will take ~300ms
-        thread(() -> {
-            fixLetsEncrypt();
-//            checkDSTRootCAX3();
-        }, "CA Certificate Check", true);
+        thread(Main::fixLetsEncrypt, "CA Certificate Check", true);
 
         Logging.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
 
@@ -107,30 +104,6 @@ public final class Main {
         }
     }
 
-    // Lets Encrypt uses ISRG Root X1 as root certificate instead.
-
-//    private static void checkDSTRootCAX3() {
-//        TrustManagerFactory tmf;
-//        try {
-//            tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-//            tmf.init((KeyStore) null);
-//        } catch (NoSuchAlgorithmException | KeyStoreException e) {
-//            LOG.log(Level.WARNING, "Failed to init TrustManagerFactory", e);
-//            // don't know what to do here
-//            return;
-//        }
-//        for (TrustManager tm : tmf.getTrustManagers()) {
-//            if (tm instanceof X509TrustManager) {
-//                for (X509Certificate cert : ((X509TrustManager) tm).getAcceptedIssuers()) {
-//                    if ("CN=DST Root CA X3, O=Digital Signature Trust Co.".equals((cert.getSubjectDN().getName()))) {
-//                        return;
-//                    }
-//                }
-//            }
-//        }
-//        showWarningAndContinue(i18n("fatal.missing_dst_root_ca_x3"));
-//    }
-
     /**
      * Indicates that a fatal error has occurred, and that the application cannot start.
      */
diff --git a/HMCL/src/main/resources/assets/lekeystore.jks b/HMCL/src/main/resources/assets/lekeystore.jks
index 12749d786bed22441a0d81d2aca0e36ee95945fe..931eed825c32408b873466a9e4429fb6d83fea73 100644
GIT binary patch
delta 62
zcmZ22w3b``-`jt085kItfS3_Xv*uQ2r&a=aHH*EvWH!%bu3{BQG(P`C>(Pmyb?fh3
NFh1dzeAkEZ5&&@P7cT$+

delta 962
zcmZ3>y;`XL-`jt085kIt;FvozB{i?4sI<7G!kB@9G2_<dE?EZF2t88+O9lpJKZ7P_
zFM}o~qXo=Nj7&@dF6%cmTwAQZtJA=;P49<8wgE32r&gOs+jm|@Mpjk^1A9Xi10^=*
zP!=v>X_w6O%#y?$h2YHeyu^~yqEv;DqI#e`3eNd@hT;aIAZ5(Ld@jKu3PJh#Kw(FP
z2x9{|ab5!h150BABSS+YL(3>}UL!*g*U-ek(9krBpbhvfs0Z56#HfVqY(`cF<|amd
z2B0_>QxhX2!~OLyrw4E}hi^HPl=^K#)0^X$b+QdkMZdXuxc0ciK?#xW2QQ4vJhdL%
zD|${|<Hxt&&f|3IyFZr|`BN`x-8Aa&dHTJ4gHZL>sRue2uiW*vSg(qQ&8T@%U6+W#
zS;6`R549|IR&p8s4cOa|dVhOha`TBt9f_~J6C2+IW$#?{$XiNdzQ^KuJhwRe?8Not
z?ke1mKBm>RT5oT`+N0c3suN0zj#g)_Ho0cd`TuE#aCHdxiEHcLM9rBbXPdIQ=h*%I
zCmjpkh!tH`dt(u5>3reOUx^rpkJDdYoi)2xcGoS{o%P3V+&?JFWVQNM-bXvVuQ42R
zY_2tDJ`tELskKcr{P9!U+4Daz#WFE7GB7T7GH@{92S$>tFeBrC7FGjhAZ5S@65t03
zumDp8n}IBd&&MLhB64K;#wFD{g}-h;^qx@q|A=TpYo`EmI0KUhb5lJqd>2dU%ob;e
zSt<8UBhB1ufAevB@57u6rYgifz8UFq$&S}<Z<qIi68UoiO>;`5Wb0-~-90Vry;;HK
z$;6ju{?snLo%QtJv%e4g?rvwW+FIbb{?pUfOdl^YbxWR}Vio6cL_#h?GG2};>I2Wm
zjcZrliEQi6dpYrI+o@kW(~MU|)<>Uvv|Oy%{j~O(nH$VK&OZ+G{(7FDr^u-N*aw&0
z!9}^wU)4Nj1*LC~Sp6@(tgzxX@1igfVM`Um)<r9rq72+0-VI>i!^Am(;dM%K!fdfU
z9VdmJU8<ef{nOT{H+9R)nvLOQua0ihu-q@2Ds$pn`Lryq-g5366S-OX*l%lY<9equ
zx5?C00G#;*b5cu+Q}dFGDho<7i;L1L48hs2d`HJd`6^bCLuR>~LLMJEH(m123B{SG
KO4W}W7Xbjp#C4wl