mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-16 11:58:00 +00:00
Code Issues Projects Releases Wiki Activity

PrepareEncryptionTask: move a bunch of stuff out of the AsyncTask class

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-04-23 16:27:49 +01:00
parent 095a21ea5a
commit b2636161f7
2 changed files with 75 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/network/mcpe/encryption/PrepareEncryptionTask.php
View File

@@ -82,36 +82,11 @@ class PrepareEncryptionTask extends AsyncTask{
public function onRun() : void{
$serverPriv = $this->serverPrivateKey;
$sharedSecret = EncryptionUtils::generateSharedSecret($serverPriv, $this->clientPub);
$salt = random_bytes(16);
$sharedSecret = $serverPriv->createExchange($this->clientPub)->calculateSharedKey();
$this->aesKey = openssl_digest($salt . hex2bin(str_pad(gmp_strval($sharedSecret, 16), 96, "0", STR_PAD_LEFT)), 'sha256', true);
$this->handshakeJwt = $this->generateServerHandshakeJwt($serverPriv, $salt);
}
private function generateServerHandshakeJwt(PrivateKeyInterface $serverPriv, string $salt) : string{
$jwtBody = self::b64UrlEncode(json_encode([
"x5u" => base64_encode((new DerPublicKeySerializer())->serialize($serverPriv->getPublicKey())),
"alg" => "ES384"
])
) . "." . self::b64UrlEncode(json_encode([
"salt" => base64_encode($salt)
])
);
openssl_sign($jwtBody, $sig, (new PemPrivateKeySerializer(new DerPrivateKeySerializer()))->serialize($serverPriv), OPENSSL_ALGO_SHA384);
$decodedSig = (new DerSignatureSerializer())->parse($sig);
$jwtSig = self::b64UrlEncode(
hex2bin(str_pad(gmp_strval($decodedSig->getR(), 16), 96, "0", STR_PAD_LEFT)) .
hex2bin(str_pad(gmp_strval($decodedSig->getS(), 16), 96, "0", STR_PAD_LEFT))
);
return "$jwtBody.$jwtSig";
}
private static function b64UrlEncode(string $str) : string{
return rtrim(strtr(base64_encode($str), '+/', '-_'), '=');
$this->aesKey = EncryptionUtils::generateKey($sharedSecret, $salt);
$this->handshakeJwt = EncryptionUtils::generateServerHandshakeJwt($serverPriv, $salt);
}
public function onCompletion() : void{