From 09b9ff319c97ebf735227f8d75ec38d34c6d3f18 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Sat, 9 Dec 2017 11:40:05 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/danog/MadelineProto/MTProtoTools/Crypt.php | 3 +-- src/danog/MadelineProto/MTProtoTools/MessageHandler.php | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/danog/MadelineProto/MTProtoTools/Crypt.php b/src/danog/MadelineProto/MTProtoTools/Crypt.php index 19c3de29..489a4894 100644 --- a/src/danog/MadelineProto/MTProtoTools/Crypt.php +++ b/src/danog/MadelineProto/MTProtoTools/Crypt.php @@ -18,7 +18,7 @@ trait Crypt { $x = ($direction === 'to server') ? 0 : 8; $sha256_a = hash('sha256', $msg_key.substr($auth_key, $x, 36), true); - $sha256_b = hash('sha256', substr($auth_key, 40+$x, 36).$msg_key, true); + $sha256_b = hash('sha256', substr($auth_key, 40 + $x, 36).$msg_key, true); $aes_key = substr($sha256_a, 0, 8).substr($sha256_b, 8, 16).substr($sha256_a, 24, 8); $aes_iv = substr($sha256_b, 0, 8).substr($sha256_a, 8, 16).substr($sha256_b, 24, 8); @@ -35,7 +35,6 @@ trait Crypt $aes_key = substr($sha1_a, 0, 8).substr($sha1_b, 8, 12).substr($sha1_c, 4, 12); $aes_iv = substr($sha1_a, 8, 12).substr($sha1_b, 0, 8).substr($sha1_c, 16, 4).substr($sha1_d, 0, 8); - return [$aes_key, $aes_iv]; } diff --git a/src/danog/MadelineProto/MTProtoTools/MessageHandler.php b/src/danog/MadelineProto/MTProtoTools/MessageHandler.php index 90b78f72..777d1507 100644 --- a/src/danog/MadelineProto/MTProtoTools/MessageHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/MessageHandler.php @@ -39,7 +39,9 @@ trait MessageHandler $seq_no = $this->generate_out_seq_no($aargs['datacenter'], $content_related); $plaintext = $this->datacenter->sockets[$aargs['datacenter']]->temp_auth_key['server_salt'].$this->datacenter->sockets[$aargs['datacenter']]->session_id.$message_id.pack('VV', $seq_no, strlen($message_data)).$message_data; $padding = $this->posmod(-strlen($plaintext), 16); - if ($padding < 12) $padding += 16; + if ($padding < 12) { + $padding += 16; + } $padding = $this->random($padding); $message_key = substr(hash('sha256', substr($this->datacenter->sockets[$aargs['datacenter']]->temp_auth_key['auth_key'], 88, 32).$plaintext.$padding, true), 8, 16);