Merge commit '11a3f9f1b906d0a73adb5a81a6eff120b56cf6fa'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/network/mcpe/VerifyLoginTask.php
This commit is contained in:
Dylan K. Taylor 2020-06-17 21:12:27 +01:00
commit 6a8bb89734

View File

@ -138,6 +138,9 @@ class ProcessLoginTask extends AsyncTask{
//First link, check that it is self-signed
$currentPublicKey = $headers->x5u;
}elseif($headers->x5u !== $currentPublicKey){
//Fast path: if the header key doesn't match what we expected, the signature isn't going to validate anyway
throw new VerifyLoginException("%pocketmine.disconnect.invalidSession.badSignature");
}
$derPublicKeySerializer = new DerPublicKeySerializer();