mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 18:32:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
Dylan K. Taylor
2021-07-26 20:14:33 +01:00
parent f9863acadc 01fe497c49
commit 09eac0e129
15 changed files with 141 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/mcpe/encryption/EncryptionUtils.php
View File

@ -41,8 +41,10 @@ final class EncryptionUtils{
}
/**
* @param resource $localPriv
* @param resource $remotePub
* @param \OpenSSLAsymmetricKey|resource $localPriv
* @param \OpenSSLAsymmetricKey|resource $remotePub
* @phpstan-param PhpOpenSSLAsymmetricKey $localPriv
* @phpstan-param PhpOpenSSLAsymmetricKey $remotePub
*/
public static function generateSharedSecret($localPriv, $remotePub) : \GMP{
$hexSecret = openssl_pkey_derive($remotePub, $localPriv, 48);
@ -57,7 +59,8 @@ final class EncryptionUtils{
}
/**
* @param resource $serverPriv
* @param \OpenSSLAsymmetricKey|resource $serverPriv
* @phpstan-param PhpOpenSSLAsymmetricKey $serverPriv
*/
public static function generateServerHandshakeJwt($serverPriv, string $salt) : string{
$derPublicKey = JwtUtils::emitDerPublicKey($serverPriv);

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

@ -38,7 +38,10 @@ class PrepareEncryptionTask extends AsyncTask{
private const TLS_KEY_ON_COMPLETION = "completion";
/** @var resource|null */
/**
* @var \OpenSSLAsymmetricKey|resource|null
* @phpstan-var PhpOpenSSLAsymmetricKey|null
*/
private static $SERVER_PRIVATE_KEY = null;
/** @var string */