Revert "Merge if you like math!"

composer.json

@@ -29,6 +29,7 @@
     },
     "require": {
         "php": ">=5.4",
+        "ext-gmp": "*",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-openssl": "*",
@@ -46,10 +47,6 @@
         "squizlabs/php_codesniffer": "~1.5.5",
         "satooshi/php-coveralls": "~0.6.1"
     },
-    "suggest": {
-        "ext-gmp": "Quickest PHP math library for doing Elliptic Curve calculations.",
-        "ext-bcmath": "PHP math library for doing Elliptic Curve calculations."
-    },
     "config": {
         "bin-dir": "bin"
     },

docs/testing.rst

@@ -91,17 +91,3 @@ please try to use phpmd. You can see the rules in ``build/rulesets/phpmd.xml``.
 .. code-block:: bash
 
     php bin/phpmd src/ text build/rulesets/phpmd.xml
-
-PHPbrew
-=======
-
-In order to test that a math library is isused when the others aren't installed 
-phpbrew can be used to install bcmath and gmp or uninstall either of them.
-
-.. code-block:: bash
-
-    ./tests/Bitpay/testMaths
-
-.. note::
-
-    phpbrew is required for testMaths to run properly.

src/Bitpay/AccessToken.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * @license Copyright 2011-2014 BitPay Inc., MIT License 
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 

src/Bitpay/AccessTokenInterface.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * @license Copyright 2011-2014 BitPay Inc., MIT License 
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 

src/Bitpay/Application.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * @license Copyright 2011-2014 BitPay Inc., MIT License 
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 

src/Bitpay/ApplicationInterface.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * @license Copyright 2011-2014 BitPay Inc., MIT License 
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 

src/Bitpay/Bill.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * @license Copyright 2011-2014 BitPay Inc., MIT License 
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 

src/Bitpay/BillInterface.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * @license Copyright 2011-2014 BitPay Inc., MIT License 
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 

src/Bitpay/Bitauth.php

@@ -0,0 +1,235 @@
+<?php
+/**
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
+ */
+
+namespace Bitpay;
+
+use Bitpay\Util\SecureRandom;
+use Bitpay\Util\Util;
+use Bitpay\Util\Gmp;
+use Bitpay\Util\Secp256k1;
+
+/**
+ * This provides an easy interface for implementing Bitauth
+ *
+ * @package Bitauth
+ */
+class Bitauth
+{
+
+    /**
+     */
+    public function __construct()
+    {
+        if (!function_exists('openssl_open')) {
+            throw new Exception('Your OpenSSL implementation is either too old or broken. Please contact your server administrator.');
+        }
+
+        if (!function_exists('mcrypt_list_algorithms')) {
+            throw new Exception('Missing mcrypt PHP extension. Cannot continue.');
+        }
+    }
+
+    /**
+     * Generate Service Identification Number (SIN)
+     *
+     * @param void
+     * @return array
+     */
+    public function generateSin()
+    {
+        $priKey = PrivateKey::create()->generate();
+        $pubKey = PublicKey::create()->setPrivateKey($priKey)->generate();
+        $sinKey = SinKey::create()->setPublicKey($pubKey)->generate();
+
+        return array(
+            'public'  => $pubKey,
+            'private' => $priKey,
+            'sin'     => $sinKey,
+        );
+    }
+
+    /**
+     * @return PublicKey
+     */
+    public function getPublicKeyFromPrivateKey(\Bitpay\PrivateKey $privateKey)
+    {
+        return PublicKey::create()->generate($privateKey);
+    }
+
+    /**
+     * @return SinKey
+     */
+    public function getSinFromPublicKey(\Bitpay\PublicKey $publicKey)
+    {
+        return $publicKey->getSin();
+    }
+
+    /**
+     * Generates an ECDSA signature of $data
+     *
+     * @param  string     $data
+     * @param  PrivateKey $privateKey
+     * @return string
+     */
+    public function sign($data, \Bitpay\PrivateKey $privateKey)
+    {
+        return $privateKey->sign($data);
+    }
+
+    /**
+     * ASN.1 DER encodes the signature based on the form:
+     * 0x30 + size(all) + 0x02 + size(r) + r + 0x02 + size(s) + s
+     * http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
+     *
+     * @param string
+     * @param string
+     * @return string
+     */
+    public static function serializeSig($r, $s)
+    {
+        $byte = '';
+        $seq = '';
+        $dec = '';
+        $retval = array();
+        $digits = array();
+
+        for ($x = 0; $x < 256; $x++) {
+            $digits[$x] = chr($x);
+        }
+
+        $dec = Util::decodeHex($r);
+
+        while (gmp_cmp($dec, '0') > 0) {
+            $dv = gmp_div($dec, '256');
+            $rem = gmp_strval(gmp_mod($dec, '256'));
+            $dec = $dv;
+            $byte = $byte.$digits[$rem];
+        }
+
+        $byte = strrev($byte);
+
+        // msb check
+        if (gmp_cmp('0x'.bin2hex($byte[0]), '0x80') >= 0) {
+            $byte = chr(0x00).$byte;
+        }
+
+        $retval['bin_r'] = bin2hex($byte);
+        $seq = chr(0x02).chr(strlen($byte)).$byte;
+        $dec = Util::decodeHex($s);
+
+        $byte = '';
+
+        while (gmp_cmp($dec, '0') > 0) {
+            $dv = gmp_div($dec, '256');
+            $rem = gmp_strval(gmp_mod($dec, '256'));
+            $dec = $dv;
+            $byte = $byte.$digits[$rem];
+        }
+
+        $byte = strrev($byte);
+
+        // msb check
+        if (gmp_cmp('0x'.bin2hex($byte[0]), '0x80') >= 0) {
+            $byte = chr(0x00).$byte;
+        }
+
+        $retval['bin_s'] = bin2hex($byte);
+        $seq = $seq.chr(0x02).chr(strlen($byte)).$byte;
+        $seq = chr(0x30).chr(strlen($seq)).$seq;
+        $retval['seq'] = bin2hex($seq);
+
+        return $retval;
+    }
+
+    /**
+     * Verifies a previously generated ECDSA signature
+     *
+     * @param array
+     * @param array
+     * @param string
+     * @return boolean
+     */
+    public function verifySignature($signature, $Q, $data)
+    {
+        $Gx = '0x'.substr(Secp256k1::G, 0, 62);
+        $Gy = '0x'.substr(Secp256k1::G, 64, 62);
+
+        $r = '0x'.$signature['r'];
+        $s = '0x'.$signature['s'];
+
+        $n_hex = '0x'.Secp256k1::N;
+        $a_hex = '0x'.Secp256k1::A;
+        $p_hex = '0x'.Secp256k1::P;
+
+        // check to see if r,s are in [1,n-1]
+        if (gmp_cmp($r, 1) <= 0 && gmp_cmp($r, $n_hex) > 0) {
+            throw new Exception('r is out of range!');
+        }
+
+        if (gmp_cmp($s, 1) <= 0 && gmp_cmp($s, $n_hex) > 0) {
+            throw new Exception('s is out of range!');
+        }
+
+        // convert the hash of the hex message to decimal
+        $e = Util::decodeHex(hash('sha256', $data));
+
+        // calculate w = s^-1 (mod n)
+        $w = gmp_invert($s, $n_hex);
+
+        // calculate u1 = e*w (mod n)
+        $u1 = gmp_mod(gmp_mul($e, $w), $n_hex);
+
+        // calculate u2 = r*w (mod n)
+        $u2 = gmp_mod(gmp_mul($r, $w), $n_hex);
+
+        $P = new Point($Gx, $Gy);
+
+        $Qx = '0x'.substr($Q, 2, 64);
+        $Qy = '0x'.substr($Q, 66, 64);
+
+        $Q = new Point($Qx, $Qy);
+
+        // Get new point Z(x1,y1) = (u1 * G) + (u2 * Q)
+        $Za = Gmp::doubleAndAdd($u1, $P);
+        $Zb = Gmp::doubleAndAdd($u2, $Q);
+        $Z  = Gmp::gmpPointAdd($Za, $Zb);
+
+        $Zx_hex = Util::encodeHex($Z->getX());
+        $Zy_hex = Util::encodeHex($Z->getY());
+
+        while (strlen($Zx_hex) < 64) {
+            $Zx_hex = '0'.$Zx_hex;
+        }
+
+        while (strlen($Zy_hex) < 64) {
+            $Zy_hex = '0'.$Zy_hex;
+        }
+
+        // Signature is valid if r is congruent to x1 (mod n)
+        // or in other words, if r - x1 is an integer multiple of n
+        $rsubx = gmp_sub($r, '0x'.$Zx_hex);
+        $rsubx_rem = gmp_div_r($rsubx, $n_hex);
+
+        if (gmp_cmp($rsubx_rem, '0') == 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Determines if a SIN is valid or not, depending on
+     * rules defined in spec, see:
+     * https://en.bitcoin.it/wiki/Identity_protocol_v1
+     *
+     * @param string
+     * @return boolean
+     */
+    public function validateSin($sin)
+    {
+        return (!empty($sin) && (substr($sin, 0, 1) == 'T'));
+    }
+}

src/Bitpay/Bitpay.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * @license Copyright 2011-2014 BitPay Inc., MIT License 
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 

src/Bitpay/Buyer.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * @license Copyright 2011-2014 BitPay Inc., MIT License 
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 

src/Bitpay/BuyerInterface.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * @license Copyright 2011-2014 BitPay Inc., MIT License 
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 

src/Bitpay/Client/Adapter/AdapterInterface.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * @license Copyright 2011-2014 BitPay Inc., MIT License 
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 

src/Bitpay/Client/Adapter/CurlAdapter.php

@@ -35,7 +35,7 @@ public function sendRequest(RequestInterface $request)
                 CURLOPT_TIMEOUT        => 10,
                 CURLOPT_SSL_VERIFYPEER => 1,
                 CURLOPT_SSL_VERIFYHOST => 2,
-                CURLOPT_CAINFO         => __DIR__.'/ca-bundle.crt',
+                CURLOPT_CAINFO         => __DIR__ . '/ca-bundle.crt',
                 CURLOPT_RETURNTRANSFER => true,
                 CURLOPT_FORBID_REUSE   => 1,
                 CURLOPT_FRESH_CONNECT  => 1,

src/Bitpay/Client/Client.php

@@ -98,7 +98,7 @@ public function setAdapter(AdapterInterface $adapter)
     }
 
     /**
-     * @param  TokenInterface  $token
+     * @param TokenInterface $token
      * @return ClientInterface
      */
     public function setToken(TokenInterface $token)
@@ -556,7 +556,7 @@ public function getInvoice($invoiceId)
     }
 
     /**
-     * @param  RequestInterface  $request
+     * @param RequestInterface $request
      * @return ResponseInterface
      */
     public function sendRequest(RequestInterface $request)

src/Bitpay/Client/ClientInterface.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * @license Copyright 2011-2014 BitPay Inc., MIT License 
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 

src/Bitpay/Client/Request.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License
+ * @license Copyright 2011-2014 BitPay Inc., MIT License 
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */