diff options
author | Brion Vibber <brion@pobox.com> | 2010-02-26 12:33:50 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-02-26 12:33:50 -0800 |
commit | 9b366547d743b9c85455e02cae2f84a658a4baf2 (patch) | |
tree | 815817fdd6a88f9cac18de9f8be0544bb8df3a80 /plugins/OStatus/lib/magicenvelope.php | |
parent | 517fd54b6515375b075a5d7253a8b66e53785baa (diff) | |
parent | 88ae7f53bb4470a899678d231cecb8cb963b2075 (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus/lib/magicenvelope.php')
-rw-r--r-- | plugins/OStatus/lib/magicenvelope.php | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php index 457c0fba2..f33119b8f 100644 --- a/plugins/OStatus/lib/magicenvelope.php +++ b/plugins/OStatus/lib/magicenvelope.php @@ -67,18 +67,8 @@ class MagicEnvelope } - public function signMessage($text, $mimetype, $signer_uri) + public function signMessage($text, $mimetype, $keypair) { - $signer_uri = $this->normalizeUser($signer_uri); - - if (!$this->checkAuthor($text, $signer_uri)) { - throw new Exception("Unable to determine entry author."); - } - - $keypair = $this->getKeyPair($signer_uri); - if (!$keypair) { - throw new Exception("Unable to retrive keypair for ". $signer_uri); - } $signature_alg = Magicsig::fromString($keypair); $armored_text = base64_encode($text); |