Merge branch 'fixtests' into 'nightly'

[quix0rs-gnu-social.git] / plugins / OStatus / classes / Magicsig.php

diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php
index 890f525862ead99c7aa997a7f9b3fcbc70d1b27e..0a0fd2e067f94be8f29ccf587883a9871a7ce7ce 100644 (file)
--- a/plugins/OStatus/classes/Magicsig.php
+++ b/plugins/OStatus/classes/Magicsig.php
@@ -27,11 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once 'Crypt/RSA.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 class Magicsig extends Managed_DataObject
 {
@@ -52,7 +48,7 @@ class Magicsig extends Managed_DataObject
     /**
      * Flattened string representation of the key pair; callers should
      * usually use $this->publicKey and $this->privateKey directly,
-     * which hold live Crypt_RSA key objects.
+     * which hold live \phpseclib\Crypt\RSA key objects.
      *
      * @var string
      */
@@ -68,14 +64,14 @@ class Magicsig extends Managed_DataObject
     /**
      * Public RSA key; gets serialized in/out via $this->keypair string.
      *
-     * @var Crypt_RSA
+     * @var \phpseclib\Crypt\RSA
      */
     public $publicKey;
 
     /**
      * PrivateRSA key; gets serialized in/out via $this->keypair string.
      *
-     * @var Crypt_RSA
+     * @var \phpseclib\Crypt\RSA
      */
     public $privateKey;
 
@@ -95,7 +91,7 @@ class Magicsig extends Managed_DataObject
     {
         $obj =  parent::getKV($k, $v);
         if ($obj instanceof Magicsig) {
-            $obj->importKeys(); // Loads Crypt_RSA objects etc.
+            $obj->importKeys(); // Loads \phpseclib\Crypt\RSA objects etc.
 
             // Throw out a big fat warning for keys of less than 1024 bits. (
             // The only case these show up in would be imported or
@@ -156,15 +152,15 @@ class Magicsig extends Managed_DataObject
         $magicsig = new Magicsig($alg);
         $magicsig->user_id = $user->id;
 
-        $rsa = new Crypt_RSA();
+        $rsa = new \phpseclib\Crypt\RSA();
 
         $keypair = $rsa->createKey($bits);
 
-        $magicsig->privateKey = new Crypt_RSA();
-        $magicsig->privateKey->loadKey($keypair['privatekey']);
+        $magicsig->privateKey = new \phpseclib\Crypt\RSA();
+        $magicsig->privateKey->load($keypair['privatekey']);
 
-        $magicsig->publicKey = new Crypt_RSA();
-        $magicsig->publicKey->loadKey($keypair['publickey']);
+        $magicsig->publicKey = new \phpseclib\Crypt\RSA();
+        $magicsig->publicKey->load($keypair['publickey']);
 
         $magicsig->insert();        // will do $this->keypair = $this->toString(true);
         $magicsig->importKeys();    // seems it's necessary to re-read keys from text keypair
@@ -185,7 +181,7 @@ class Magicsig extends Managed_DataObject
         $exp = call_user_func($base64_func, $this->publicKey->exponent->toBytes());
 
         $private_exp = '';
-        if ($full_pair && $this->privateKey instanceof Crypt_RSA && $this->privateKey->exponent->toBytes()) {
+        if ($full_pair && $this->privateKey instanceof \phpseclib\Crypt\RSA && $this->privateKey->exponent->toBytes()) {
             $private_exp = '.' . call_user_func($base64_func, $this->privateKey->exponent->toBytes());
         }
 
@@ -203,15 +199,15 @@ class Magicsig extends Managed_DataObject
         return strtolower(hash('sha256', $this->toString(false, false)));
     }
 
-    public function exportPublicKey($format=CRYPT_RSA_PUBLIC_FORMAT_PKCS1)
+    public function exportPublicKey($type='PKCS1')
     {
         $this->publicKey->setPublicKey();
-        return $this->publicKey->getPublicKey($format);
+        return $this->publicKey->getPublicKey($type);
     }
 
     /**
      * importKeys will load the object's keypair string, which initiates
-     * loadKey() and configures Crypt_RSA objects.
+     * loadKey() and configures \phpseclib\Crypt\RSA objects.
      *
      * @param string $keypair optional, otherwise the object's "keypair" property will be used
      */
@@ -240,21 +236,20 @@ class Magicsig extends Managed_DataObject
     }
 
     /**
-     * Fill out $this->privateKey or $this->publicKey with a Crypt_RSA object
+     * Fill out $this->privateKey or $this->publicKey with a \phpseclib\Crypt\RSA object
      * representing the give key (as mod/exponent pair).
      *
-     * @param string $mod base64-encoded
-     * @param string $exp base64-encoded exponent
+     * @param string $mod base64url-encoded
+     * @param string $exp base64url-encoded exponent
      * @param string $type one of 'public' or 'private'
      */
     public function loadKey($mod, $exp, $type = 'public')
     {
-        $rsa = new Crypt_RSA();
-        $rsa->setSignatureMode(CRYPT_RSA_SIGNATURE_PKCS1);
+        $rsa = new \phpseclib\Crypt\RSA();
         $rsa->setHash($this->getHash());
-        $rsa->modulus = new Math_BigInteger(Magicsig::base64_url_decode($mod), 256);
+        $rsa->modulus = new \phpseclib\Math\BigInteger(Magicsig::base64_url_decode($mod), 256);
         $rsa->k = strlen($rsa->modulus->toBytes());
-        $rsa->exponent = new Math_BigInteger(Magicsig::base64_url_decode($exp), 256);
+        $rsa->exponent = new \phpseclib\Math\BigInteger(Magicsig::base64_url_decode($exp), 256);
 
         if ($type == 'private') {
             $this->privateKey = $rsa;
@@ -263,6 +258,15 @@ class Magicsig extends Managed_DataObject
         }
     }
 
+    public function loadPublicKeyPKCS1($key)
+    {
+        $rsa = new \phpseclib\Crypt\RSA();
+        if (!$rsa->setPublicKey($key, 'PKCS1')) {
+            throw new ServerException('Could not load PKCS1 public key. We probably got this from a remote Diaspora node as the profile public key.');
+        }
+        $this->publicKey = $rsa;
+    }
+
     /**
      * Returns the name of the crypto algorithm used for this key.
      *
@@ -296,7 +300,7 @@ class Magicsig extends Managed_DataObject
      */
     public function sign($bytes)
     {
-        $sig = $this->privateKey->sign($bytes);
+        $sig = $this->privateKey->sign($bytes, \phpseclib\Crypt\RSA::PADDING_PKCS1);
         if ($sig === false) {
             throw new ServerException('Could not sign data');
         }
@@ -312,7 +316,7 @@ class Magicsig extends Managed_DataObject
     public function verify($signed_bytes, $signature)
     {
         $signature = self::base64_url_decode($signature);
-        return $this->publicKey->verify($signed_bytes, $signature);
+        return $this->publicKey->verify($signed_bytes, $signature, \phpseclib\Crypt\RSA::PADDING_PKCS1);
     }
 
     /**