Merge branch '1.0' into 2.0

phpseclib · Oct 13, 2018 · f938922 · f938922
2 parents f5a9c08 + 2d7aadc
commit f938922
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/phpseclib/Crypt/Hash.php b/phpseclib/Crypt/Hash.php
@@ -112,6 +112,15 @@ class Hash
      */
     var $key = false;
 
+    /**
+     * Computed Key
+     *
+     * @see self::_computeKey()
+     * @var string
+     * @access private
+     */
+    var $computedKey = false;
+
     /**
      * Outer XOR (Internal HMAC)
      *
@@ -183,6 +192,11 @@ function setKey($key = false)
      */
     function _computeKey()
     {
+        if ($this->key === false) {
+            $this->computedKey = false;
+            return;
+        }
+
         if (strlen($this->key) <= $this->b) {
             $this->computedKey = $this->key;
             return;