From 1d2a563c8706ddea3840f032c6591924cf01679c Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 14 Jan 2009 21:56:01 -0700
Subject: [PATCH] md5()/sha1() -> hash()

---
 framework/Browser/lib/Horde/Browser.php                | 2 +-
 framework/Crypt/lib/Horde/Crypt/smime.php              | 4 ++--
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php   | 4 ++--
 framework/Imap_Client/lib/Horde/Imap/Client/Cache.php  | 2 +-
 framework/Oauth/lib/Horde/Oauth/Request.php            | 2 +-
 framework/Secret/lib/Horde/Secret.php                  | 4 ++--
 framework/Support/lib/Horde/Support/ConsistentHash.php | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/framework/Browser/lib/Horde/Browser.php b/framework/Browser/lib/Horde/Browser.php
index c7d15ae60..b1cb7e698 100644
--- a/framework/Browser/lib/Horde/Browser.php
+++ b/framework/Browser/lib/Horde/Browser.php
@@ -270,7 +270,7 @@ class Horde_Browser
     {
         static $instances = array();
 
-        $signature = md5(serialize(array($userAgent, $accept)));
+        $signature = hash('md5', serialize(array($userAgent, $accept)));
         if (empty($instances[$signature])) {
             $instances[$signature] = new Horde_Browser($userAgent, $accept);
         }
diff --git a/framework/Crypt/lib/Horde/Crypt/smime.php b/framework/Crypt/lib/Horde/Crypt/smime.php
index 2dc3ea338..64528a749 100644
--- a/framework/Crypt/lib/Horde/Crypt/smime.php
+++ b/framework/Crypt/lib/Horde/Crypt/smime.php
@@ -701,8 +701,8 @@ class Horde_Crypt_smime extends Horde_Crypt
         }
 
         $cert_details = array();
-        $cert_details['fingerprints']['md5'] = md5($raw_cert);
-        $cert_details['fingerprints']['sha1'] = sha1($raw_cert);
+        $cert_details['fingerprints']['md5'] = hash('md5', $raw_cert);
+        $cert_details['fingerprints']['sha1'] = hash('sha1', $raw_cert);
 
         $cert_details['certificate']['extensions'] = array();
         $cert_details['certificate']['version'] = $cert_data[1][0][1][0][1] + 1;
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
index 8bb743f4f..9ad0448ea 100644
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
@@ -314,7 +314,7 @@ abstract class Horde_Imap_Client_Base extends Horde_Imap_Client
     {
         $additional = array_map(array('Horde_Imap_Client_Utf7imap', 'Utf7ImapToUtf8'), $additional);
 
-        $sig = md5(serialize($additional));
+        $sig = hash('md5', serialize($additional));
 
         if (isset($this->_init['namespace'][$sig])) {
             return $this->_init['namespace'][$sig];
@@ -1843,7 +1843,7 @@ abstract class Horde_Imap_Client_Base extends Horde_Imap_Client
             }
 
             if (!empty($crit)) {
-                $sig = md5(serialize(array_values($crit)));
+                $sig = hash('md5', serialize(array_values($crit)));
                 if (isset($new_criteria[$sig])) {
                     $new_criteria[$sig]['i'][] = $id;
                 } else {
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Cache.php b/framework/Imap_Client/lib/Horde/Imap/Client/Cache.php
index 22ef45cd7..55c2f1671 100644
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Cache.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Cache.php
@@ -90,7 +90,7 @@ class Horde_Imap_Client_Cache
     {
         static $instance = array();
 
-        $sig = md5(serialize($params));
+        $sig = hash('md5', serialize($params));
         if (!isset($instance[$sig])) {
             $instance[$sig] = new Horde_Imap_Client_Cache($params);
         }
diff --git a/framework/Oauth/lib/Horde/Oauth/Request.php b/framework/Oauth/lib/Horde/Oauth/Request.php
index aa0a16643..2676e58f7 100644
--- a/framework/Oauth/lib/Horde/Oauth/Request.php
+++ b/framework/Oauth/lib/Horde/Oauth/Request.php
@@ -84,7 +84,7 @@ class Horde_Oauth_Request
         $mt = microtime();
         $rand = mt_rand();
 
-        return md5(microtime() . mt_rand());
+        return hash('md5', microtime() . mt_rand());
     }
 
     /**
diff --git a/framework/Secret/lib/Horde/Secret.php b/framework/Secret/lib/Horde/Secret.php
index be1ef8ed8..1a35fcdc7 100644
--- a/framework/Secret/lib/Horde/Secret.php
+++ b/framework/Secret/lib/Horde/Secret.php
@@ -100,7 +100,7 @@ class Horde_Secret
      */
     static protected function _getCipherOb($key)
     {
-        $idx = md5($key);
+        $idx = hash('md5', $key);
 
         if (!isset(self::$_cipherCache[$idx])) {
             self::$_cipherCache[$idx] = &Horde_Cipher::factory('blowfish');
@@ -126,7 +126,7 @@ class Horde_Secret
             if (isset($_COOKIE[$keyname . '_key'])) {
                 $key = $_COOKIE[$keyname . '_key'];
             } else {
-                $key = md5(mt_rand());
+                $key = hash('md5', mt_rand());
                 $_COOKIE[$keyname . '_key'] = $key;
                 Secret::_setCookie($keyname, $key);
             }
diff --git a/framework/Support/lib/Horde/Support/ConsistentHash.php b/framework/Support/lib/Horde/Support/ConsistentHash.php
index e094afd07..6177f931b 100644
--- a/framework/Support/lib/Horde/Support/ConsistentHash.php
+++ b/framework/Support/lib/Horde/Support/ConsistentHash.php
@@ -230,7 +230,7 @@ class Horde_Support_ConsistentHash
      */
     public function hash($key)
     {
-        return substr(md5($key), 0, 8);
+        return substr(hash('md5', $key), 0, 8);
     }
 
     /**
-- 
2.11.0