TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-31 03:07:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve precision and flexibility of encrypt methods

Browse Source
This commit is contained in:
games647
2022-06-23 19:25:12 +02:00
parent 3767b022a9
commit 700b889aa9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/EncryptionUtil.java
View File

@ -49,7 +49,7 @@ import java.security.spec.X509EncodedKeySpec;
import java.time.Instant; import java.time.Instant;
import java.util.Base64; import java.util.Base64;
import java.util.Base64.Encoder; import java.util.Base64.Encoder;
import java.util.Random; import java.util.random.RandomGenerator;
import javax.crypto.BadPaddingException; import javax.crypto.BadPaddingException;
import javax.crypto.Cipher; import javax.crypto.Cipher;
@ -110,7 +110,7 @@ class EncryptionUtil {
* @param random random generator * @param random random generator
* @return an error with 4 bytes long * @return an error with 4 bytes long
*/ */
public static byte[] generateVerifyToken(Random random) { public static byte[] generateVerifyToken(RandomGenerator random) {
// extracted from LoginListener // extracted from LoginListener
byte[] token = new byte[VERIFY_TOKEN_LENGTH]; byte[] token = new byte[VERIFY_TOKEN_LENGTH];
random.nextBytes(token); random.nextBytes(token);
@ -120,14 +120,14 @@ class EncryptionUtil {
/** /**
* Generate the server id based on client and server data. * Generate the server id based on client and server data.
* *
* @param sessionId session for the current login attempt * @param serverId session for the current login attempt
* @param sharedSecret shared secret between the client and the server * @param sharedSecret shared secret between the client and the server
* @param publicKey public key of the server * @param publicKey public key of the server
* @return the server id formatted as a hexadecimal string. * @return the server id formatted as a hexadecimal string.
*/ */
public static String getServerIdHashString(String sessionId, SecretKey sharedSecret, PublicKey publicKey) { public static String getServerIdHashString(String serverId, SecretKey sharedSecret, PublicKey publicKey) {
// found in LoginListener // found in LoginListener
byte[] serverHash = getServerIdHash(sessionId, publicKey, sharedSecret); byte[] serverHash = getServerIdHash(serverId, publicKey, sharedSecret);
return (new BigInteger(serverHash)).toString(16); return (new BigInteger(serverHash)).toString(16);
} }
@ -185,7 +185,7 @@ class EncryptionUtil {
return expiry + "-----BEGIN RSA PUBLIC KEY-----\n" + encoded + "\n-----END RSA PUBLIC KEY-----\n"; return expiry + "-----BEGIN RSA PUBLIC KEY-----\n" + encoded + "\n-----END RSA PUBLIC KEY-----\n";
} }
public static byte[] decrypt(PrivateKey key, byte[] data) private static byte[] decrypt(PrivateKey key, byte[] data)
throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException,
IllegalBlockSizeException, BadPaddingException { IllegalBlockSizeException, BadPaddingException {
// b(Key var0, byte[] var1) // b(Key var0, byte[] var1)