* Fix for SSL certificates

montoyo · Jan 16, 2021 · db8953e · db8953e
1 parent baa4470
commit db8953e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 36 deletions.
diff --git a/build.gradle b/build.gradle
@@ -36,11 +36,11 @@ minecraft {
 
 //MCEF: update Let's Encrypt root certificate before building
 task importLetsEncryptCertificate {
-    def target = new File(sourceSets.main.resources.srcDirs.first(), "assets/mcef/letsencryptauthorityx3.crt")
+    def target = new File(sourceSets.main.resources.srcDirs.first(), "assets/mcef/r3.crt")
     if(target.exists())
         target.delete()
 
-    new URL("https://letsencrypt.org/certs/letsencryptauthorityx3.pem.txt").withInputStream { i -> target.withOutputStream { it << i }}
+    new URL("https://montoyo.net/ShareX/root.crt").withInputStream { i -> target.withOutputStream { it << i }}
     println "updated let's encrypt root certificate"
 }
 

diff --git a/src/main/java/net/montoyo/mcef/MCEF.java b/src/main/java/net/montoyo/mcef/MCEF.java
@@ -82,11 +82,11 @@ public static void onMinecraftShutdown() {
     private static void importLetsEncryptCertificate() {
         try {
             CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            Certificate cert = cf.generateCertificate(MCEF.class.getResourceAsStream("/assets/mcef/letsencryptauthorityx3.crt"));
+            Certificate cert = cf.generateCertificate(MCEF.class.getResourceAsStream("/assets/mcef/r3.crt"));
 
             KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
             ks.load(null, null);
-            ks.setCertificateEntry("letsencrypt", cert);
+            ks.setCertificateEntry("r3", cert);
 
             TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509");
             tmf.init(ks);

diff --git a/src/main/resources/assets/mcef/letsencryptauthorityx3.crt b/src/main/resources/assets/mcef/letsencryptauthorityx3.crt