Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-04 21:01:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Explicitly specify all encryption algorithm components.

Browse source
This commit is contained in:
Steveice10 2018-09-06 01:27:40 -07:00
parent 4017ec0aea
commit 2aa66f73e1
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/com/github/steveice10/mc/protocol/util/CryptUtil.java
View file

@ -23,7 +23,7 @@ public class CryptUtil {
public static SecretKey generateSharedKey() {
try {
KeyGenerator gen = KeyGenerator.getInstance("AES");
KeyGenerator gen = KeyGenerator.getInstance("AES/CFB8/NoPadding");
gen.init(128);
return gen.generateKey();
} catch(NoSuchAlgorithmException e) {
@ -50,7 +50,7 @@ public class CryptUtil {
}
public static SecretKey decryptSharedKey(PrivateKey privateKey, byte[] sharedKey) {
return new SecretKeySpec(decryptData(privateKey, sharedKey), "AES");
return new SecretKeySpec(decryptData(privateKey, sharedKey), "AES/CFB8/NoPadding");
}
public static byte[] encryptData(Key key, byte[] data) {
@ -73,22 +73,13 @@ public class CryptUtil {
public static byte[] getServerIdHash(String serverId, PublicKey publicKey, SecretKey secretKey) {
try {
return encrypt("SHA-1", new byte[][]{serverId.getBytes("ISO_8859_1"), secretKey.getEncoded(), publicKey.getEncoded()});
} catch(UnsupportedEncodingException e) {
throw new Error("Failed to generate server id hash.", e);
}
}
private static byte[] encrypt(String encryption, byte[]... data) {
try {
MessageDigest digest = MessageDigest.getInstance(encryption);
for(byte array[] : data) {
digest.update(array);
}
MessageDigest digest = MessageDigest.getInstance("SHA-1");
digest.update(serverId.getBytes("ISO_8859_1"));
digest.update(secretKey.getEncoded());
digest.update(publicKey.getEncoded());
return digest.digest();
} catch(NoSuchAlgorithmException e) {
throw new Error("Failed to encrypt data.", e);
} catch(Exception e) {
throw new Error("Failed to generate server ID hash.", e);
}
}
}