Merge 'stable' into 'minor-next'

Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/18249531120
This commit is contained in:
pmmp-admin-bot[bot]
2025-10-04 21:05:41 +00:00
2 changed files with 10 additions and 0 deletions

View File

@@ -85,6 +85,13 @@ Note that there might be a long wait time before a reviewer looks at your PR.
Depending on the changes, maintainers might ask you to make changes to the PR to fix problems or to improve the code.
**Do not delete your fork** while your pull request remains open, otherwise you won't be able to make any requested changes and the PR will end up being declined.
> [!TIP]
> Don't worry about getting a PR perfect on the first try.
> In fact, it's quite unusual for a PR to be perfect when it's first submitted, and most PRs will get changes requested by reviewers, even when the PR is made by one of our team members.
>
> Mistakes are normal, and PMMP team members will review your code and suggest changes to your code as needed.
> Just make sure to stick with it so you can communicate with reviewers and/or make changes.
### Requirements
The following are required as a minimum for pull requests. PRs that don't meet these requirements will be declined unless updated to meet them.

View File

@@ -51,6 +51,9 @@ class PrepareEncryptionTask extends AsyncTask{
private string $clientPub,
\Closure $onCompletion
){
//make sure the key is valid before we break the stack trace
//TODO: maybe in the future we should require OpenSSLAsymmetricKey here instead of string
JwtUtils::parseDerPublicKey($this->clientPub);
if(self::$SERVER_PRIVATE_KEY === null){
$serverPrivateKey = openssl_pkey_new(["ec" => ["curve_name" => "secp384r1"]]);
if($serverPrivateKey === false){