Null check for when encryption is disabled.

This commit is contained in:
Mike 2020-05-02 03:38:22 +02:00
parent 90061e8d7d
commit 208be6210c
2 changed files with 12 additions and 0 deletions

View File

@ -1,5 +1,6 @@
package com.eu.habbo.messages.incoming.handshake;
import com.eu.habbo.Emulator;
import com.eu.habbo.crypto.HabboRC4;
import com.eu.habbo.messages.NoAuthMessage;
import com.eu.habbo.messages.incoming.MessageHandler;
@ -13,6 +14,11 @@ public class CompleteDiffieHandshakeEvent extends MessageHandler {
@Override
public void handle() throws Exception {
if (this.client.getEncryption() == null) {
Emulator.getGameServer().getGameClientManager().disposeClient(this.client);
return;
}
byte[] sharedKey = this.client.getEncryption().getDiffie().getSharedKey(this.packet.readString());
this.client.sendResponse(new CompleteDiffieHandshakeComposer(this.client.getEncryption().getDiffie().getPublicKey()));

View File

@ -1,5 +1,6 @@
package com.eu.habbo.messages.incoming.handshake;
import com.eu.habbo.Emulator;
import com.eu.habbo.messages.NoAuthMessage;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.handshake.InitDiffieHandshakeComposer;
@ -9,6 +10,11 @@ public class InitDiffieHandshakeEvent extends MessageHandler {
@Override
public void handle() throws Exception {
if (this.client.getEncryption() == null) {
Emulator.getGameServer().getGameClientManager().disposeClient(this.client);
return;
}
this.client.sendResponse(new InitDiffieHandshakeComposer(
this.client.getEncryption().getDiffie().getSignedPrime(),
this.client.getEncryption().getDiffie().getSignedGenerator()));