Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-17 01:15:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add the new keys (3.2 Support) (#1923)

Browse Source 
* Add the new keys

* Some improvements to the key loading system & Bump the game version
This commit is contained in:
lilmayofuksu
2022-11-02 01:28:04 +03:00
committed by GitHub
parent 7bfb35ac39
commit 4ed0b90c27
10 changed files with 71 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/GameConstants.java
View File

@@ -6,7 +6,7 @@ import emu.grasscutter.utils.Position;
import emu.grasscutter.utils.Utils;
public final class GameConstants {
public static String VERSION = "3.1.0";
public static String VERSION = "3.2.0";
public static final int DEFAULT_TEAMS = 4;
public static final int MAX_TEAMS = 10;

22
src/main/java/emu/grasscutter/utils/Crypto.java
View File

@@ -1,5 +1,7 @@
package emu.grasscutter.utils;
import java.io.File;
import java.nio.file.Path;
import java.security.KeyFactory;
import java.security.PrivateKey;
import java.security.PublicKey;
@@ -8,6 +10,7 @@ import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
import java.util.Map;
import java.util.HashMap;
import java.util.regex.Pattern;
import emu.grasscutter.Grasscutter;
@@ -36,14 +39,21 @@ public final class Crypto {
CUR_SIGNING_KEY = KeyFactory.getInstance("RSA")
.generatePrivate(new PKCS8EncodedKeySpec(FileUtils.readResource("/keys/SigningKey.der")));
var CNRelSign = KeyFactory.getInstance("RSA")
.generatePublic(new X509EncodedKeySpec(FileUtils.readResource("/keys/CNRel_Pub.der")));
Pattern pattern = Pattern.compile("([0-9]*)_Pub\\.der");
for (Path path : FileUtils.getPathsFromResource("/keys/game_keys")) {
if (path.toString().endsWith("_Pub.der")) {
var OSRelSign = KeyFactory.getInstance("RSA")
.generatePublic(new X509EncodedKeySpec(FileUtils.readResource("/keys/OSRel_Pub.der")));
var m = pattern.matcher(path.getFileName().toString());
EncryptionKeys.put(2, CNRelSign);
EncryptionKeys.put(3, OSRelSign);
if (m.matches())
{
var key = KeyFactory.getInstance("RSA")
.generatePublic(new X509EncodedKeySpec(FileUtils.read(path)));
EncryptionKeys.put(Integer.valueOf(m.group(1)), key);
}
}
}
}
catch (Exception e) {
Grasscutter.getLogger().error("An error occurred while loading keys.", e);