Skip to content

Commit 8204b34

Browse files
committed
Update let's encrypt root ca for the updater
1 parent 5179e17 commit 8204b34

File tree

5 files changed

+40
-3
lines changed

5 files changed

+40
-3
lines changed

build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ repositories {
2828

2929
group = 'net.minecraftforgefrance'
3030
archivesBaseName = 'installer'
31-
version = '2.4.0'
31+
version = '2.4.1'
3232
targetCompatibility = '1.6'
3333
sourceCompatibility = '1.6'
3434

@@ -78,6 +78,7 @@ task updaterJar(type: Jar, dependsOn: "jar"){
7878
include "fr/minecraftforgefrance/common/**"
7979
include "langs/**"
8080
include "letsencryptauthorityx3.pem"
81+
include "lets-encrypt-r3.pem"
8182
}
8283

8384
task fullUpdaterJar(type: Jar, dependsOn: "updaterJar"){

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

src/main/java/fr/minecraftforgefrance/common/DownloadUtils.java

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public static void readRemoteList(List<FileEntry> files, List<String> dirs)
6868
{
6969
reader = new InputStreamReader(connection.getInputStream(), Charsets.UTF_8);
7070
}
71+
7172
JsonRootNode data = parser.parse(reader);
7273

7374
for(int i = 0; i < data.getElements().size(); i++)

src/main/java/fr/minecraftforgefrance/updater/Updater.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public boolean shouldDownloadLib()
177177
return forgeUpdate;
178178
}
179179

180-
// Minecraft new launcher use Java 8u25, so let's encrypt cert isn't recognized. This code add the let's encrypt root cert in trust certs list.
180+
// Minecraft launcher use Java 8u51, so let's encrypt certificate isn't recognized. This code add the let's encrypt root cert in trust certs list.
181181
public void injectLECert()
182182
{
183183
try
@@ -192,6 +192,11 @@ public void injectLECert()
192192
keyStore.setCertificateEntry("letsencryptauthorityx3", crt);
193193
Logger.info("Added Cert for " + ((X509Certificate)crt).getSubjectDN());
194194

195+
InputStream caInput2 = new BufferedInputStream(Updater.class.getResourceAsStream("/lets-encrypt-r3.pem"));
196+
Certificate crt2 = cf.generateCertificate(caInput2);
197+
keyStore.setCertificateEntry("letsencryptauthorityx3", crt2);
198+
Logger.info("Added Cert for " + ((X509Certificate)crt2).getSubjectDN());
199+
195200
TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
196201
tmf.init(keyStore);
197202
SSLContext sslContext = SSLContext.getInstance("TLS");
+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
3+
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
4+
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
5+
WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
6+
RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
7+
AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
8+
R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
9+
sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
10+
NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
11+
Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
12+
/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
13+
AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
14+
Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
15+
FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
16+
AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
17+
Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
18+
gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
19+
PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
20+
ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
21+
CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
22+
lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
23+
avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
24+
yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
25+
yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
26+
hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
27+
HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
28+
MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
29+
nLRbwHOoq7hHwg==
30+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)