keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move salmonKey to Salmon class

Browse source 
move the salmonKey function from Crypto to Salmon
This commit is contained in:
Adam Magness 2017-12-31 08:04:36 -05:00
parent 0131fd5745
commit db653e4451
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mod/hostxrd.php
View file

@ -5,6 +5,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Protocol\Salmon;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;
function hostxrd_init(App $a) function hostxrd_init(App $a)
@ -25,7 +26,7 @@ function hostxrd_init(App $a)
'$zhost' => $a->get_hostname(), '$zhost' => $a->get_hostname(),
'$zroot' => System::baseUrl(), '$zroot' => System::baseUrl(),
'$domain' => System::baseUrl(), '$domain' => System::baseUrl(),
'$bigkey' => Crypto::salmonKey(Config::get('system', 'site_pubkey'))) '$bigkey' => Salmon::salmonKey(Config::get('system', 'site_pubkey')))
); );
exit(); exit();

6
mod/xrd.php
View file

@ -5,7 +5,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Util\Crypto; use Friendica\Protocol\Salmon;
function xrd_init(App $a) function xrd_init(App $a)
{ {
@ -58,7 +58,7 @@ function xrd_init(App $a)
function xrd_json($a, $uri, $alias, $profile_url, $r) function xrd_json($a, $uri, $alias, $profile_url, $r)
{ {
$salmon_key = Crypto::salmonKey($r['spubkey']); $salmon_key = Salmon::salmonKey($r['spubkey']);
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header("Content-type: application/json; charset=utf-8"); header("Content-type: application/json; charset=utf-8");
@ -84,7 +84,7 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
function xrd_xml($a, $uri, $alias, $profile_url, $r) function xrd_xml($a, $uri, $alias, $profile_url, $r)
{ {
$salmon_key = Crypto::salmonKey($r['spubkey']); $salmon_key = Salmon::salmonKey($r['spubkey']);
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header("Content-type: text/xml"); header("Content-type: text/xml");

12
src/Protocol/Salmon.php
View file

@ -106,7 +106,7 @@ class Salmon
$data_type = 'application/atom+xml'; $data_type = 'application/atom+xml';
$encoding = 'base64url'; $encoding = 'base64url';
$algorithm = 'RSA-SHA256'; $algorithm = 'RSA-SHA256';
$keyhash = base64url_encode(hash('sha256', Crypto::salmonKey($owner['spubkey'])), true); $keyhash = base64url_encode(hash('sha256', self::salmonKey($owner['spubkey'])), true);
$precomputed = '.' . base64url_encode($data_type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($algorithm); $precomputed = '.' . base64url_encode($data_type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($algorithm);
@ -200,4 +200,14 @@ class Salmon
return (($return_code >= 200) && ($return_code < 300)) ? 0 : 1; return (($return_code >= 200) && ($return_code < 300)) ? 0 : 1;
} }
/**
* @param string $pubkey public key
* @return string
*/
public static function salmonKey($pubkey)
{
self::pemToMe($pubkey, $m, $e);
return 'RSA' . '.' . base64url_encode($m, true) . '.' . base64url_encode($e, true);
}
} }

10
src/Util/Crypto.php
View file

@ -215,16 +215,6 @@ class Crypto
return $key; return $key;
} }
/**
* @param string $pubkey public key
* @return string
*/
public static function salmonKey($pubkey)
{
self::pemToMe($pubkey, $m, $e);
return 'RSA' . '.' . base64url_encode($m, true) . '.' . base64url_encode($e, true);
}
/** /**
* @param integer $bits number of bits * @param integer $bits number of bits
* @return mixed * @return mixed