mirrors/Havana
1
Fork 0
mirror of https://github.com/Quackster/Havana.git synced 2025-07-02 04:37:47 +00:00
Code Activity

don't use specific charset during encryption codecs

Browse source
This commit is contained in:
Quackster 2024-07-13 17:53:31 +10:00
parent c5490b8161
commit d2c648dcbb
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionDecoder.java
View file

@ -39,7 +39,7 @@ public class EncryptionDecoder extends ByteToMessageDecoder {
byte[] tHeaderMsg = new byte[6];
buffer.readBytes(tHeaderMsg);
tHeader = new String(tHeaderMsg, StringUtil.getCharset());
tHeader = new String(tHeaderMsg);
tHeader = this.pHeaderDecoder.kg4R6Jo5xjlqtFGs1klMrK4ZTzb3R(tHeader);
int tByte1 = ((int) tHeader.charAt(3)) & 63;
@ -60,14 +60,14 @@ public class EncryptionDecoder extends ByteToMessageDecoder {
byte[] tBodyMsg = new byte[pMsgSize];
buffer.readBytes(tBodyMsg);
tBody = new String(tBodyMsg, StringUtil.getCharset());
tBody = new String(tBodyMsg);
tBody = this.pDecoder.kg4R6Jo5xjlqtFGs1klMrK4ZTzb3R(tBody);
tBody = NettyPlayerNetwork.removePadding(tBody, player.getNetwork().getTx() % 5);
ByteBuf result = Unpooled.buffer();
result.writeBytes(Base64Encoding.encode(tBody.length(), 3));
result.writeBytes(tBody.getBytes(StringUtil.getCharset()));
result.writeBytes(tBody.getBytes());
out.add(result);
}

10
Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionEncoder.java
View file

@ -13,6 +13,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.math.BigInteger;
import java.nio.charset.Charset;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
@ -35,7 +36,10 @@ public class EncryptionEncoder extends MessageToMessageEncoder<ByteBuf> {
player.getNetwork().getRx()
));
String tOriginalMsg = buffer.toString(StringUtil.getCharset());
byte[] tOriginalMsgBytes = new byte[buffer.readableBytes()];
buffer.readBytes(tOriginalMsgBytes);
String tOriginalMsg = new String(tOriginalMsgBytes);
String tHeader;
String tMsg;
@ -53,8 +57,8 @@ public class EncryptionEncoder extends MessageToMessageEncoder<ByteBuf> {
var tEncryptedMsg = Unpooled.buffer();
tEncryptedMsg.writeBytes(tHeader.getBytes(StringUtil.getCharset()));
tEncryptedMsg.writeBytes(tMsg.getBytes(StringUtil.getCharset()));
tEncryptedMsg.writeBytes(tHeader.getBytes());
tEncryptedMsg.writeBytes(tMsg.getBytes());
out.add(tEncryptedMsg);
}