From 9494b0e5d79601b339bf28967a65ffdfe9458532 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Mon, 22 Feb 2010 23:30:21 -0500
Subject: [PATCH] magicsig shuffling

---
 plugins/OStatus/lib/magicenvelope.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 1ae80d70c1..81f4609c5c 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -27,8 +27,6 @@
  * @link      http://status.net/
  */
 
-require_once 'magicsig.php';
-
 class MagicEnvelope
 {
     const ENCODING = 'base64url';
@@ -64,7 +62,7 @@ class MagicEnvelope
             return false;
         }
 
-        $signature_alg = new MagicsigRsaSha256($this->getKeyPair($signer_uri));
+        $signature_alg = Magicsig::fromString($this->getKeyPair($signer_uri));
         $armored_text = base64_encode($text);
 
         return array(
@@ -139,7 +137,7 @@ class MagicEnvelope
         $text = base64_decode($env['data']);
         $signer_uri = $this->getAuthor($text);
 
-        $verifier = new MagicsigRsaSha256($this->getKeyPair($signer_uri));
+        $verifier = Magicsig::fromString($this->getKeyPair($signer_uri));
 
         return $verifier->verify($env['data'], $env['sig']);
     }
-- 
2.39.5