Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-29 23:17:59 +02:00
Code Issues Projects Releases Wiki Activity

Cipher#update is copy-safe

Browse Source 
Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2021-09-15 03:47:48 +02:00
parent 30a668aa6a
commit 2ecd10a4ec
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/minestom/server/network/player/PlayerSocketConnection.java
View File

@ -92,17 +92,13 @@ public class PlayerSocketConnection extends PlayerConnection {
// Decrypt data // Decrypt data
if (encrypted) { if (encrypted) {
final Cipher cipher = decryptCipher; final Cipher cipher = decryptCipher;
final int remainingBytes = readBuffer.readableBytes(); ByteBuffer input = readBuffer.asByteBuffer(0, readBuffer.writerOffset());
final byte[] bytes = readBuffer.readRemainingBytes();
byte[] output = new byte[cipher.getOutputSize(remainingBytes)];
try { try {
cipher.update(bytes, 0, remainingBytes, output, 0); cipher.update(input, input.duplicate());
} catch (ShortBufferException e) { } catch (ShortBufferException e) {
MinecraftServer.getExceptionManager().handleException(e); MinecraftServer.getExceptionManager().handleException(e);
return; return;
} }
readBuffer.clear();
readBuffer.writeBytes(output);
} }
// Read all packets // Read all packets
while (readBuffer.readableBytes() > 0) { while (readBuffer.readableBytes() > 0) {
@ -278,16 +274,11 @@ public class PlayerSocketConnection extends PlayerConnection {
final Cipher cipher = encryptCipher; final Cipher cipher = encryptCipher;
// Encrypt data first // Encrypt data first
ByteBuffer cipherInput = localBuffer.asByteBuffer(0, localBuffer.writerOffset()); ByteBuffer cipherInput = localBuffer.asByteBuffer(0, localBuffer.writerOffset());
BinaryBuffer pooled = PooledBuffers.get();
ByteBuffer cipherOutput = pooled.asByteBuffer(0, pooled.capacity());
try { try {
cipher.update(cipherInput, cipherOutput); cipher.update(cipherInput, cipherInput.duplicate());
} catch (ShortBufferException e) { } catch (ShortBufferException e) {
MinecraftServer.getExceptionManager().handleException(e); MinecraftServer.getExceptionManager().handleException(e);
} }
localBuffer.clear();
localBuffer.write(cipherOutput.flip());
PooledBuffers.add(pooled);
} }
this.waitingBuffers.add(localBuffer); this.waitingBuffers.add(localBuffer);