GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[ActivityPub][RSA] Fix types of generate_keys

Browse Source
This commit is contained in:
Diogo Cordeiro 2019-11-16 15:32:49 +00:00 committed by Diogo Peralta Cordeiro
parent 3d805026a2
commit c96dafa191
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/ActivityPub/classes/Activitypub_rsa.php
View File

@ -112,7 +112,8 @@ class Activitypub_rsa extends Managed_DataObject
$this->store_keys(); $this->store_keys();
$apRSA->public_key = $this->public_key; $apRSA->public_key = $this->public_key;
} else { } else {
// This should never happen, but try to recover! // ASSERT: This should never happen, but try to recover!
common_log(LOG_ERR, "Activitypub_rsa: An impossible thing has happened... Please let the devs know that it entered in line 116 at Activitypub_rsa.php");
if ($fetch) { if ($fetch) {
$res = Activitypub_explorer::get_remote_user_activity(ActivityPubPlugin::actor_uri($profile)); $res = Activitypub_explorer::get_remote_user_activity(ActivityPubPlugin::actor_uri($profile));
Activitypub_rsa::update_public_key($profile, $res['publicKey']['publicKeyPem']); Activitypub_rsa::update_public_key($profile, $res['publicKey']['publicKeyPem']);
@ -144,11 +145,11 @@ class Activitypub_rsa extends Managed_DataObject
/** /**
* Generates a pair of RSA keys. * Generates a pair of RSA keys.
* *
* @param string $private_key in/out * @param string $private_key out
* @param string $public_key in/out * @param string $public_key out
* @author PHP Manual Contributed Notes <dirt@awoms.com> * @author PHP Manual Contributed Notes <dirt@awoms.com>
*/ */
public static function generate_keys(string &$private_key, string &$public_key): void public static function generate_keys(?string &$private_key, ?string &$public_key): void
{ {
$config = [ $config = [
'digest_alg' => 'sha512', 'digest_alg' => 'sha512',