Skip to content

Commit 62798e9

Browse files
committed
try to fix encryption issue no success
1 parent 42e10f0 commit 62798e9

File tree

2 files changed

+10
-3
lines changed
  • nexo-net-packet/src/main/java/com/nexoscript/nexonet/packet/crypto
  • nexo-net-server/src/main/java/com/nexoscript/nexonet/server

2 files changed

+10
-3
lines changed

nexo-net-packet/src/main/java/com/nexoscript/nexonet/packet/crypto/CryptoManager.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,14 @@ public String decryptString(String data) {
7474
this.logger.log(LoggingType.INFO, "Try to decode String");
7575
cipher.init(Cipher.DECRYPT_MODE, secretKey);
7676
String s = new String(cipher.doFinal(Base64.getDecoder().decode(data)));
77-
s = '=' + s;
77+
try {
78+
byte[] decoded = cipher.doFinal(Base64.getDecoder().decode(data));
79+
logger.log(LoggingType.INFO, "Decoded length: " + decoded.length);
80+
} catch (IllegalArgumentException e) {
81+
logger.log(LoggingType.ERROR, "Invalid Base64 input: " + data);
82+
throw new RuntimeException("Invalid Base64 encoding", e);
83+
}
84+
//s = '=' + s;
7885
logger.log(LoggingType.INFO, "Crypto: " + s);
7986
s = s.replace('=', '{').replace('+', '}');
8087
logger.log(LoggingType.INFO, "Crypto: " + s);

nexo-net-server/src/main/java/com/nexoscript/nexonet/server/Server.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public Server(String hostname, boolean useCrypto) {
6363
}
6464

6565
public Server(boolean logging, boolean useCrypto) {
66-
this.logging = false;
67-
this.logger = new NexonetLogger(false);
66+
this.logging = logging;
67+
this.logger = new NexonetLogger(logging);
6868
if(useCrypto) {
6969
this.packetManager = new PacketManager(this.logger, "secret.key", CryptoType.AES, KeySize.KEY_128);
7070
} else {

0 commit comments

Comments
 (0)