Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-07 00:23:20 +08:00
Code Issues Projects Releases Wiki Activity

security: add secure mode and padding scheme

Browse Source
This commit is contained in:
Breno A. 2024-06-09 13:06:59 -03:00
parent c313939ec0
commit 63fbe66158
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
View File

@ -103,7 +103,7 @@ public final class DefaultAuthenticators {
KeyFactory keyFactory = KeyFactory.getInstance("RSA"); KeyFactory keyFactory = KeyFactory.getInstance("RSA");
RSAPrivateKey private_key = (RSAPrivateKey) keyFactory.generatePrivate(keySpec); RSAPrivateKey private_key = (RSAPrivateKey) keyFactory.generatePrivate(keySpec);
Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding"); Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
cipher.init(Cipher.DECRYPT_MODE, private_key); cipher.init(Cipher.DECRYPT_MODE, private_key);

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
View File

@ -113,7 +113,7 @@ public class HandlerGetPlayerTokenReq extends PacketHandler {
if (req.getKeyId() > 0) { if (req.getKeyId() > 0) {
var encryptSeed = session.getEncryptSeed(); var encryptSeed = session.getEncryptSeed();
try { try {
var cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding"); var cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
cipher.init(Cipher.DECRYPT_MODE, Crypto.CUR_SIGNING_KEY); cipher.init(Cipher.DECRYPT_MODE, Crypto.CUR_SIGNING_KEY);
var clientSeedEncrypted = Utils.base64Decode(req.getClientRandKey()); var clientSeedEncrypted = Utils.base64Decode(req.getClientRandKey());

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

@ -10,6 +10,7 @@ import java.security.spec.*;
import java.util.*; import java.util.*;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import javax.crypto.NoSuchPaddingException;
public final class Crypto { public final class Crypto {
@ -100,8 +101,8 @@ public final class Crypto {
if (key_id == null) { if (key_id == null) {
throw new Exception("Key ID was not set"); throw new Exception("Key ID was not set");
} }
Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
cipher.init(Cipher.ENCRYPT_MODE, EncryptionKeys.get(Integer.valueOf(key_id))); cipher.init(Cipher.ENCRYPT_MODE, EncryptionKeys.get(Integer.valueOf(key_id)));
// Encrypt regionInfo in chunks // Encrypt regionInfo in chunks