diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-22 12:37:45 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-22 12:37:45 -0700 |
commit | 26f49de0dd5673584e734152d2d3329b90eb6978 (patch) | |
tree | 2ba00544c77cc3bfe0cafb4fa8fe60ce73d31d79 /plugins/OStatus/classes/Magicsig.php | |
parent | c85228eadc60b50ed6e7c9cba596c3e66f5214b2 (diff) | |
parent | 27bfd1211d64298ee3c3b2d82d7b38ca1e1167ad (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
lib/attachmentlist.php
Diffstat (limited to 'plugins/OStatus/classes/Magicsig.php')
-rw-r--r-- | plugins/OStatus/classes/Magicsig.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php index 5705ecc11..87c684c93 100644 --- a/plugins/OStatus/classes/Magicsig.php +++ b/plugins/OStatus/classes/Magicsig.php @@ -27,8 +27,6 @@ * @link http://status.net/ */ -require_once 'Crypt/RSA.php'; - class Magicsig extends Memcached_DataObject { @@ -102,16 +100,16 @@ class Magicsig extends Memcached_DataObject public function generate($user_id) { - $rsa = new Crypt_RSA(); + $rsa = new SafeCrypt_RSA(); $keypair = $rsa->createKey(); $rsa->loadKey($keypair['privatekey']); - $this->privateKey = new Crypt_RSA(); + $this->privateKey = new SafeCrypt_RSA(); $this->privateKey->loadKey($keypair['privatekey']); - $this->publicKey = new Crypt_RSA(); + $this->publicKey = new SafeCrypt_RSA(); $this->publicKey->loadKey($keypair['publickey']); $this->user_id = $user_id; @@ -163,7 +161,7 @@ class Magicsig extends Memcached_DataObject { common_log(LOG_DEBUG, "Adding ".$type." key: (".$mod .', '. $exp .")"); - $rsa = new Crypt_RSA(); + $rsa = new SafeCrypt_RSA(); $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1; $rsa->setHash('sha256'); $rsa->modulus = new Math_BigInteger(base64_url_decode($mod), 256); |