diff options
Diffstat (limited to 'Tests/Auth/OpenID')
| -rw-r--r-- | Tests/Auth/OpenID/Consumer.php | 2 | ||||
| -rw-r--r-- | Tests/Auth/OpenID/CryptUtil.php | 8 | ||||
| -rw-r--r-- | Tests/Auth/OpenID/DiffieHellman.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Tests/Auth/OpenID/Consumer.php b/Tests/Auth/OpenID/Consumer.php index bb73733..c0aa74f 100644 --- a/Tests/Auth/OpenID/Consumer.php +++ b/Tests/Auth/OpenID/Consumer.php @@ -61,7 +61,7 @@ function Auth_OpenID_associate($qs, $assoc_secret, $assoc_handle) Auth_OpenID_array_get($query_data, 'openid.dh_modulus', null), Auth_OpenID_array_get($query_data, 'openid.dh_gen', null)); - $composite = Auth_OpenID_CryptUtil::base64ToLong( + $composite = Auth_OpenID_base64ToLong( $query_data['openid.dh_consumer_public']); $enc_mac_key = Auth_OpenID_CryptUtil::toBase64( diff --git a/Tests/Auth/OpenID/CryptUtil.php b/Tests/Auth/OpenID/CryptUtil.php index a392c50..f57455a 100644 --- a/Tests/Auth/OpenID/CryptUtil.php +++ b/Tests/Auth/OpenID/CryptUtil.php @@ -137,7 +137,7 @@ class Tests_Auth_OpenID_BinLongConvertRnd extends PHPUnit_TestCase { } $s = Auth_OpenID_longToBinary($n); $this->assertTrue(is_string($s)); - $n_prime = Auth_OpenID_CryptUtil::binaryToLong($s); + $n_prime = Auth_OpenID_binaryToLong($s); $this->assertEquals($this->lib->cmp($n, $n_prime), 0); } } @@ -156,7 +156,7 @@ class Tests_Auth_OpenID_BinLongConvert extends PHPUnit_TestCase { function runTest() { - $n_prime = Auth_OpenID_CryptUtil::binaryToLong($this->bin); + $n_prime = Auth_OpenID_binaryToLong($this->bin); $s_prime = Auth_OpenID_longToBinary($this->lng); $this->assertEquals($this->lib->cmp($this->lng, $n_prime), 0); $this->assertTrue($this->bin == $s_prime); @@ -177,7 +177,7 @@ class Tests_Auth_OpenID_Base64ToLong extends PHPUnit_TestCase { function runTest() { - $actual = Auth_OpenID_CryptUtil::base64ToLong($this->b64); + $actual = Auth_OpenID_base64ToLong($this->b64); $this->assertTrue($this->lib->cmp($this->num, $actual) == 0); } } @@ -246,7 +246,7 @@ class Tests_Auth_OpenID_CryptUtil extends PHPUnit_TestSuite { if (!defined('Auth_OpenID_NO_MATH_SUPPORT')) { $this->addTestSuite('Tests_Auth_OpenID_BigInt'); - $lib =& Auth_OpenID_MathLibrary::getLibWrapper(); + $lib =& Auth_OpenID_getMathLib(); $max = Auth_OpenID_CryptUtil::maxint(); $upper = defined('Tests_Auth_OpenID_thorough') ? 499 : 3; diff --git a/Tests/Auth/OpenID/DiffieHellman.php b/Tests/Auth/OpenID/DiffieHellman.php index 57704a7..5e43174 100644 --- a/Tests/Auth/OpenID/DiffieHellman.php +++ b/Tests/Auth/OpenID/DiffieHellman.php @@ -40,7 +40,7 @@ class Tests_Auth_OpenID_DiffieHellman_Private extends PHPUnit_TestCase { function runTest() { - $lib =& Auth_OpenID_MathLibrary::getLibWrapper(); + $lib =& Auth_OpenID_getMathLib(); $dh = new Auth_OpenID_DiffieHellman(null, null, $this->input); $this->assertEquals($lib->cmp($this->expected, $dh->getPublicKey()), 0); } @@ -57,7 +57,7 @@ class Tests_Auth_OpenID_DiffieHellman_Exch extends PHPUnit_TestCase { function runTest() { - $lib =& Auth_OpenID_MathLibrary::getLibWrapper(); + $lib =& Auth_OpenID_getMathLib(); $shared = $lib->init($this->shared); $dh1 = new Auth_OpenID_DiffieHellman(null, null, $this->p1); $dh2 = new Auth_OpenID_DiffieHellman(null, null, $this->p2); |