GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Merge branch 'floodgate-2.0' of https://github.com/Tim203/Geyser into floodgate-2.0

Browse source
This commit is contained in:
Camotoy 2021-01-10 16:02:25 -05:00
commit 7e63f50fd0
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/src/main/java/org/geysermc/floodgate/crypto/AesCipher.java
View file

@ -31,6 +31,7 @@ import lombok.RequiredArgsConstructor;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
import javax.crypto.spec.GCMParameterSpec; import javax.crypto.spec.GCMParameterSpec;
import java.nio.Buffer;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.security.Key; import java.security.Key;
import java.security.SecureRandom; import java.security.SecureRandom;
@ -99,13 +100,15 @@ public final class AesCipher implements FloodgateCipher {
} }
ivLength = buffer.position() - mark - 1; // don't include the splitter itself ivLength = buffer.position() - mark - 1; // don't include the splitter itself
buffer.position(mark); // reset to the pre-while index // don't remove this cast, it'll cause problems if you remove it
((Buffer) buffer).position(mark); // reset to the pre-while index
} }
byte[] iv = new byte[ivLength]; byte[] iv = new byte[ivLength];
buffer.get(iv); buffer.get(iv);
buffer.position(buffer.position() + 1); // skip splitter // don't remove this cast, it'll cause problems if you remove it
((Buffer) buffer).position(buffer.position() + 1); // skip splitter
byte[] cipherText = new byte[buffer.remaining()]; byte[] cipherText = new byte[buffer.remaining()];
buffer.get(cipherText); buffer.get(cipherText);