[project @ Moved CryptUtil functions into an Auth_OpenID_CryptUtil class.]

2 files changed, 8 insertions, 8 deletions

diff --git a/Tests/Auth/OpenID/CryptUtil.php b/Tests/Auth/OpenID/CryptUtil.php
index a1fcf97..4970023 100644
--- a/Tests/Auth/OpenID/CryptUtil.php
+++ b/Tests/Auth/OpenID/CryptUtil.php
@@ -21,7 +21,7 @@ class Tests_Auth_OpenID_CryptUtil extends PHPUnit_TestCase {
     {
         $cases = array(1, 10, 255);
         foreach ($cases as $length) {
-            $data = Auth_OpenID_getBytes($length);
+            $data = Auth_OpenID_CryptUtil::getBytes($length);
             $this->assertEquals(strlen($data), $length);
         }
     }
@@ -31,10 +31,10 @@ class Tests_Auth_OpenID_CryptUtil extends PHPUnit_TestCase {
         $num_iterations = 100;
         $data_length = 20;
 
-        $data = Auth_OpenID_getBytes($num_iterations);
+        $data = Auth_OpenID_CryptUtil::getBytes($num_iterations);
         for ($i = 0; $i < $num_iterations; $i++) {
             $last = $data;
-            $data = Auth_OpenID_getBytes($data_length);
+            $data = Auth_OpenID_CryptUtil::getBytes($data_length);
             $this->assertFalse($data == $last);
         }
     }
@@ -44,8 +44,8 @@ class Tests_Auth_OpenID_CryptUtil extends PHPUnit_TestCase {
         // It's possible, but HIGHLY unlikely that a correct
         // implementation will fail by returning the same number twice
 
-        $s = Auth_OpenID_getBytes(32);
-        $t = Auth_OpenID_getBytes(32);
+        $s = Auth_OpenID_CryptUtil::getBytes(32);
+        $t = Auth_OpenID_CryptUtil::getBytes(32);
         $this->assertEquals(strlen($s), 32);
         $this->assertEquals(strlen($t), 32);
         $this->assertFalse($s == $t);
diff --git a/Tests/Auth/OpenID/StoreTest.php b/Tests/Auth/OpenID/StoreTest.php
index 11b9bd5..7cac11d 100644
--- a/Tests/Auth/OpenID/StoreTest.php
+++ b/Tests/Auth/OpenID/StoreTest.php
@@ -66,7 +66,7 @@ class Tests_Auth_OpenID_StoreTest extends PHPUnit_TestCase {
      */
     function generateNonce()
     {
-        return Auth_OpenID_randomString(8, $this->allowed_nonce);
+        return Auth_OpenID_CryptUtil::randomString(8, $this->allowed_nonce);
     }
 
     /**
@@ -74,8 +74,8 @@ class Tests_Auth_OpenID_StoreTest extends PHPUnit_TestCase {
      */
     function genAssoc($now, $issued = 0, $lifetime = 600)
     {
-        $sec = Auth_OpenID_randomString(20);
-        $hdl = Auth_OpenID_randomString(128, $this->allowed_handle);
+        $sec = Auth_OpenID_CryptUtil::randomString(20);
+        $hdl = Auth_OpenID_CryptUtil::randomString(128, $this->allowed_handle);
         return new Auth_OpenID_Association($hdl, $sec, $now + $issued,
                                           $lifetime, 'HMAC-SHA1');
     }