mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-15 19:46:20 +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

12
src/network/mcpe/JwtUtils.php
View File

@@ -97,7 +97,8 @@ final class JwtUtils{
}
/**
* @param resource $signingKey
* @param \OpenSSLAsymmetricKey|resource $signingKey
* @phpstan-param PhpOpenSSLAsymmetricKey $signingKey
*
* @throws JwtException
*/
@@ -132,7 +133,8 @@ final class JwtUtils{
}
/**
* @param resource $signingKey
* @param \OpenSSLAsymmetricKey|resource $signingKey
* @phpstan-param PhpOpenSSLAsymmetricKey $signingKey
*
* @phpstan-param array<string, mixed> $header
* @phpstan-param array<string, mixed> $claims
@@ -189,7 +191,8 @@ final class JwtUtils{
}
/**
* @param resource $opensslKey
* @param \OpenSSLAsymmetricKey|resource $opensslKey
* @phpstan-param PhpOpenSSLAsymmetricKey $opensslKey
*/
public static function emitDerPublicKey($opensslKey) : string{
$details = openssl_pkey_get_details($opensslKey);
@@ -209,7 +212,8 @@ final class JwtUtils{
}
/**
* @return resource
* @return \OpenSSLAsymmetricKey|resource
* @phpstan-return PhpOpenSSLAsymmetricKey
*/
public static function parseDerPublicKey(string $derKey){
$signingKeyOpenSSL = openssl_pkey_get_public(sprintf("-----BEGIN PUBLIC KEY-----\n%s\n-----END PUBLIC KEY-----\n", base64_encode($derKey)));

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 */

5
src/network/query/DedicatedQueryNetworkInterface.php
View File

@@ -63,7 +63,10 @@ final class DedicatedQueryNetworkInterface implements AdvancedNetworkInterface{
private $port;
/** @var \Logger */
private $logger;
/** @var resource */
/**
* @var \Socket|resource
* @phpstan-var PhpSocket
*/
private $socket;
/** @var Network */
private $network;