Partially Revert "Don't use local cipher caches if the key changed (B…

…ug #14231)." In Horde_Secret, the cache key is built from the secret key, so it invalidates itself. This reverts commit d9defef.
horde · Feb 12, 2016 · f878461 · f878461
1 parent d9defef
commit f878461
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/framework/Secret/lib/Horde/Secret.php b/framework/Secret/lib/Horde/Secret.php
@@ -115,8 +115,7 @@ protected function _getCipherOb($key)
         $key = substr($key, 0, 56);
 
         $idx = hash('md5', $key);
-        if (!isset($this->_cipherCache[$idx]) ||
-            $this->_cipherCache[$idx]->key != $key) {
+        if (!isset($this->_cipherCache[$idx])) {
             $this->_cipherCache[$idx] = new Horde_Crypt_Blowfish($key);
         }
 

diff --git a/framework/Secret/package.xml b/framework/Secret/package.xml
@@ -27,7 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [jan] Don&apos;t use local cipher cache if the key changed (Bug #14231).
+* 
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -446,7 +446,7 @@ Initial release as a PEAR package
    <date>2016-02-02</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* [jan] Don&apos;t use local cipher cache if the key changed (Bug #14231).
+* 
    </notes>
   </release>
  </changelog>