MD5 -> SHA1

horde · Jan 23, 2014 · b27143a · b27143a
1 parent 8baa684
commit b27143a
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/framework/Core/lib/Horde/Core/Factory/BlockCollection.php b/framework/Core/lib/Horde/Core/Factory/BlockCollection.php
@@ -54,7 +54,7 @@ public function create(array $apps = array(), $layout = 'portal_layout')
             ? $registry->listApps()
             : array_intersect($registry->listApps(), $apps);
         sort($apps);
-        $sig = hash('md5', serialize(array($apps, $layout)));
+        $sig = hash('sha1', serialize(array($apps, $layout)));
 
         if (!isset($this->_instances[$sig])) {
             if (!($ob = $session->retrieve('horde', 'blocks/' . $sig))) {

diff --git a/framework/Core/lib/Horde/Core/Factory/Db.php b/framework/Core/lib/Horde/Core/Factory/Db.php
@@ -48,7 +48,7 @@ class Horde_Core_Factory_Db extends Horde_Core_Factory_Base
      */
     public function create($app = 'horde', $backend = null)
     {
-        $sig = hash('md5', serialize(array($app, $backend)));
+        $sig = hash('sha1', serialize(array($app, $backend)));
 
         if (isset($this->_instances[$sig])) {
             return $this->_instances[$sig];

diff --git a/framework/Core/lib/Horde/Core/Factory/DbPear.php b/framework/Core/lib/Horde/Core/Factory/DbPear.php
@@ -49,7 +49,7 @@ public function create($type = 'rw', $app = 'horde', $dtype = null)
     {
         global $registry;
 
-        $sig = hash('md5', serialize($type . '|' . $app . '|' . $dtype));
+        $sig = hash('sha1', serialize($type . '|' . $app . '|' . $dtype));
 
         if (isset($this->_instances[$sig])) {
             return $this->_instances[$sig];

diff --git a/framework/Core/lib/Horde/Core/Factory/Ldap.php b/framework/Core/lib/Horde/Core/Factory/Ldap.php
@@ -48,7 +48,7 @@ class Horde_Core_Factory_Ldap extends Horde_Core_Factory_Base
      */
     public function create($app = 'horde', $backend = null)
     {
-        $sig = hash('md5', serialize(array($app, $backend)));
+        $sig = hash('sha1', serialize(array($app, $backend)));
 
         if (isset($this->_instances[$sig])) {
             return $this->_instances[$sig];

diff --git a/framework/Core/lib/Horde/Core/Factory/Nosql.php b/framework/Core/lib/Horde/Core/Factory/Nosql.php
@@ -44,7 +44,7 @@ class Horde_Core_Factory_Nosql extends Horde_Core_Factory_Base
      */
     public function create($app = 'horde', $backend = null)
     {
-        $sig = hash('md5', serialize(array($app, $backend)));
+        $sig = hash('sha1', serialize(array($app, $backend)));
 
         if (isset($this->_instances[$sig])) {
             return $this->_instances[$sig];

diff --git a/framework/Core/lib/Horde/Core/Factory/Prefs.php b/framework/Core/lib/Horde/Core/Factory/Prefs.php
@@ -108,7 +108,7 @@ function_exists($params['user_hook'])) {
             'sizecallback' => !is_null($opts['sizecallback'])
         ));
         ksort($sig_opts);
-        $sig = hash('md5', serialize($sig_opts));
+        $sig = hash('sha1', serialize($sig_opts));
 
         if (isset($this->_instances[$sig])) {
             $this->_instances[$sig]->retrieve($scope);

diff --git a/framework/Core/lib/Horde/Core/Topbar.php b/framework/Core/lib/Horde/Core/Topbar.php
@@ -268,7 +268,7 @@ public function getTree()
      */
     public function getHash()
     {
-        return hash('md5', serialize($this->getTree()));
+        return hash('sha1', serialize($this->getTree()));
     }
 
     /**

diff --git a/framework/Core/lib/Horde/Script/File.php b/framework/Core/lib/Horde/Script/File.php
@@ -154,7 +154,7 @@ protected function _url($file, $full)
         /* Add cache-busting version param. */
         return empty($GLOBALS['conf']['cachejsparams']['url_version_param'])
             ? $url
-            : $url->add('v', hash('md5', $GLOBALS['registry']->getVersion($this->app)));
+            : $url->add('v', hash('sha1', $GLOBALS['registry']->getVersion($this->app)));
     }
 
 }
diff --git a/framework/Core/lib/Horde/Themes/Css.php b/framework/Core/lib/Horde/Themes/Css.php
@@ -103,7 +103,7 @@ public function getStylesheetUrls(array $opts = array())
                 $url = Horde::url($file['uri'], true, -1);
                 $css_out[] = (is_null($file['app']) || empty($conf['cachecssparams']['url_version_param']))
                     ? $url
-                    : $url->add('v', hash('md5', $registry->getVersion($file['app'])));
+                    : $url->add('v', hash('sha1', $registry->getVersion($file['app'])));
             }
             return $css_out;
         }
@@ -115,7 +115,7 @@ public function getStylesheetUrls(array $opts = array())
         }
 
         $out = '';
-        $sig = hash('md5', serialize($css) . $this->_cacheid);
+        $sig = hash('sha1', serialize($css) . $this->_cacheid);
 
         switch ($cache_type) {
         case 'filesystem':