wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

const'ifying bits and sigalg

Browse Source 
Also we should move away from 1024 bit keys as soon as we can.
This commit is contained in:
Mikael Nordfeldth 2015-01-24 12:08:05 +01:00
parent bf2f1c23b7
commit cce808b27c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,9 @@ class Magicsig extends Managed_DataObject
const PUBLICKEYREL = 'magic-public-key';
const DIASPORA_PUBLICKEYREL = 'diaspora-public-key';
const DEFAULT_KEYLEN = 1024;
const DEFAULT_SIGALG = 'RSA-SHA256';
public $__table = 'magicsig';
/**
@ -77,7 +80,7 @@ class Magicsig extends Managed_DataObject
*/
public $privateKey;
public function __construct($alg = 'RSA-SHA256')
public function __construct($alg=self::DEFAULT_SIGALG)
{
$this->alg = $alg;
}
@ -144,9 +147,12 @@ class Magicsig extends Managed_DataObject
* Warning: this can be very slow on systems without the GMP module.
* Runtimes of 20-30 seconds are not unheard-of.
*
* FIXME: More than 1024 bits please. But StatusNet _discards_ non-1024 bits,
* so we'll have to wait the last mohican out before switching defaults.
*
* @param User $user the local user (since we don't have remote private keys)
*/
public static function generate(User $user, $bits=1024, $alg='RSA-SHA256')
public static function generate(User $user, $bits=self::DEFAULT_KEYLEN, $alg=self::DEFAULT_SIGALG)
{
$magicsig = new Magicsig($alg);
$magicsig->user_id = $user->id;