mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-29 22:59:59 +00:00
Code Issues Projects Releases Wiki Activity

EncryptionContext: provide the packet ID in the exception message

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-11-10 14:45:19 +00:00
parent 6a266bcbd1
commit e23379c34b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/mcpe/encryption/EncryptionContext.php
View File

@ -75,8 +75,10 @@ class EncryptionContext{
$decrypted = $this->decryptCipher->decryptUpdate($encrypted); $decrypted = $this->decryptCipher->decryptUpdate($encrypted);
$payload = substr($decrypted, 0, -8); $payload = substr($decrypted, 0, -8);
if(($expected = $this->calculateChecksum($this->decryptCounter++, $payload)) !== ($actual = substr($decrypted, -8))){ $packetCounter = $this->decryptCounter++;
throw new DecryptionException("Encrypted payload has invalid checksum (expected " . bin2hex($expected) . ", got " . bin2hex($actual) . ")");
if(($expected = $this->calculateChecksum($packetCounter, $payload)) !== ($actual = substr($decrypted, -8))){
throw new DecryptionException("Encrypted packet $packetCounter has invalid checksum (expected " . bin2hex($expected) . ", got " . bin2hex($actual) . ")");
} }
return $payload; return $payload;