Improve PHP 5 compliance

dereckson · Oct 8, 2010 · 8fb7137 · 8fb7137
1 parent c78da98
commit 8fb7137
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/Auth/OpenID/BigMath.php b/Auth/OpenID/BigMath.php
@@ -365,7 +365,6 @@ function Auth_OpenID_detectMathLibrary($exts)
 {
     $loaded = false;
 
-	$hasDl = function_exists('dl');
     foreach ($exts as $extension) {
         if (extension_loaded($extension['extension'])) {
             return $extension;

diff --git a/Auth/OpenID/Consumer.php b/Auth/OpenID/Consumer.php
@@ -1185,7 +1185,7 @@ function _discoverAndVerify($claimed_id, $to_match_endpoints)
         // oidutil.log('Performing discovery on %s' % (claimed_id,))
         list($unused, $services) = call_user_func($this->discoverMethod,
                                                   $claimed_id,
-                                                  $this->fetcher);
+                                                  &$this->fetcher);
 
         if (!$services) {
             return new Auth_OpenID_FailureResponse(null,

diff --git a/Auth/OpenID/HMAC.php b/Auth/OpenID/HMAC.php
@@ -60,6 +60,13 @@ function Auth_OpenID_HMACSHA1($key, $text)
         $key = Auth_OpenID_SHA1($key, true);
     }
 
+    if (function_exists('hash_hmac') &&
+        function_exists('hash_algos') &&
+        (in_array('sha1', hash_algos()))) {
+        return hash_hmac('sha1', $text, $key, true);
+    }
+    // Home-made solution
+
     $key = str_pad($key, Auth_OpenID_SHA1_BLOCKSIZE, chr(0x00));
     $ipad = str_repeat(chr(0x36), Auth_OpenID_SHA1_BLOCKSIZE);
     $opad = str_repeat(chr(0x5c), Auth_OpenID_SHA1_BLOCKSIZE);

diff --git a/Auth/Yadis/Manager.php b/Auth/Yadis/Manager.php
@@ -413,7 +413,7 @@ function getNextService($discover_cb, $fetcher)
 
             list($yadis_url, $services) = call_user_func($discover_cb,
                                                          $this->url,
-                                                         $fetcher);
+                                                         &$fetcher);
 
             $manager = $this->createManager($services, $yadis_url);
         }