eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

* i18n/L10n updates and FIXMEs added

Browse Source 
* whitespace fixes
This commit is contained in:
Siebrand Mazeland
2010-09-03 01:35:04 +02:00
parent e365e709c5
commit 1bfbe9badf
26 changed files with 147 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/OStatus/lib/magicenvelope.php
View File

@@ -32,7 +32,7 @@ class MagicEnvelope
const ENCODING = 'base64url';
const NS = 'http://salmon-protocol.org/ns/magic-env';
private function normalizeUser($user_id)
{
if (substr($user_id, 0, 5) == 'http:' ||
@@ -70,13 +70,13 @@ class MagicEnvelope
$keypair = $parts[1];
}
}
if ($keypair) {
return $keypair;
}
}
}
throw new Exception('Unable to locate signer public key');
throw new Exception('Unable to locate signer public key.');
}
@@ -92,8 +92,7 @@ class MagicEnvelope
'sig' => $signature_alg->sign($armored_text),
'alg' => $signature_alg->getName()
);
}
public function toXML($env) {
@@ -105,13 +104,13 @@ class MagicEnvelope
$xs->element('me:alg', null, $env['alg']);
$xs->element('me:sig', null, $env['sig']);
$xs->elementEnd('me:env');
$string = $xs->getString();
common_debug($string);
return $string;
}
public function unfold($env)
{
$dom = new DOMDocument();
@@ -137,7 +136,7 @@ class MagicEnvelope
return $dom->saveXML();
}
public function getAuthor($text) {
$doc = new DOMDocument();
if (!$doc->loadXML($text)) {
@@ -154,12 +153,12 @@ class MagicEnvelope
}
}
}
public function checkAuthor($text, $signer_uri)
{
return ($this->getAuthor($text) == $signer_uri);
}
public function verify($env)
{
if ($env['alg'] != 'RSA-SHA256') {
@@ -181,14 +180,14 @@ class MagicEnvelope
common_log(LOG_DEBUG, "Salmon error: ".$e->getMessage());
return false;
}
$verifier = Magicsig::fromString($keypair);
if (!$verifier) {
common_log(LOG_DEBUG, "Salmon error: unable to parse keypair");
return false;
}
return $verifier->verify($env['data'], $env['sig']);
}