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

Magicsig::generate is now static

Browse Source 
This also fixes a problem with "initial salmon slap", which was a
problem for newly registered accounts which would have their first
salmon slap fail to distribute since there was a problem with Magicsig
keys. Apparently we have to re-read them with importKeys so the
Crypt_RSA objects publicKey and privateKey match later instances of them.

I think it may have been that generate() doesn't specify a signatureMode,
but I leave experimentation of that to the future.
This commit is contained in:
Mikael Nordfeldth
2014-06-02 21:50:40 +02:00
parent 537dff7987
commit 0bc122ff58
3 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/OStatus/classes/Magicsig.php
View File

@@ -132,7 +132,7 @@ class Magicsig extends Managed_DataObject
*/
function insert()
{
$this->keypair = $this->toString();
$this->keypair = $this->toString(true);
return parent::insert();
}
@@ -145,20 +145,25 @@ class Magicsig extends Managed_DataObject
*
* @param User $user the local user (since we don't have remote private keys)
*/
public function generate(User $user, $bits=1024)
public static function generate(User $user, $bits=1024, $alg='RSA-SHA256')
{
$magicsig = new Magicsig($alg);
$magicsig->user_id = $user->id;
$rsa = new Crypt_RSA();
$keypair = $rsa->createKey($bits);
$this->privateKey = new Crypt_RSA();
$this->privateKey->loadKey($keypair['privatekey']);
$magicsig->privateKey = new Crypt_RSA();
$magicsig->privateKey->loadKey($keypair['privatekey']);
$this->publicKey = new Crypt_RSA();
$this->publicKey->loadKey($keypair['publickey']);
$magicsig->publicKey = new Crypt_RSA();
$magicsig->publicKey->loadKey($keypair['publickey']);
$this->user_id = $user->id;
$this->insert();
$magicsig->insert(); // will do $this->keypair = $this->toString(true);
$magicsig->importKeys(); // seems it's necessary to re-read keys from text keypair
return $magicsig;
}
/**
@@ -172,7 +177,7 @@ class Magicsig extends Managed_DataObject
$mod = Magicsig::base64_url_encode($this->publicKey->modulus->toBytes());
$exp = Magicsig::base64_url_encode($this->publicKey->exponent->toBytes());
$private_exp = '';
if ($full_pair && $this->privateKey->exponent->toBytes()) {
if ($full_pair && $this->privateKey instanceof Crypt_RSA && $this->privateKey->exponent->toBytes()) {
$private_exp = '.' . Magicsig::base64_url_encode($this->privateKey->exponent->toBytes());
}