diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-06-15 12:10:56 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-14 13:52:04 +0200 |
| commit | 8795fe9c77d634cb99d6f1f30a0022a6ba972785 (patch) | |
| tree | 2eca2b1aa60057501577c3ebffa7f04f2a9b3a13 | |
| parent | d3d317a2dea4b3c9c7732975d9a41834ef080a49 (diff) | |
| download | forums-8795fe9c77d634cb99d6f1f30a0022a6ba972785.tar forums-8795fe9c77d634cb99d6f1f30a0022a6ba972785.tar.gz forums-8795fe9c77d634cb99d6f1f30a0022a6ba972785.tar.bz2 forums-8795fe9c77d634cb99d6f1f30a0022a6ba972785.tar.xz forums-8795fe9c77d634cb99d6f1f30a0022a6ba972785.zip | |
[feature/passwords] Add convert flag for converting to default
PHPBB3-11610
| -rw-r--r-- | phpBB/includes/crypto/manager.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/phpBB/includes/crypto/manager.php b/phpBB/includes/crypto/manager.php index 2647836cc8..1f6ba78666 100644 --- a/phpBB/includes/crypto/manager.php +++ b/phpBB/includes/crypto/manager.php @@ -31,6 +31,11 @@ class phpbb_crypto_manager protected $type_map = false; /** + * Password convert flag. Password should be converted + */ + public $convert_flag = false; + + /** * Crypto helper * @var phpbb_crypto_helper */ @@ -183,18 +188,14 @@ class phpbb_crypto_manager // Multiple hash passes needed if (is_array($stored_hash_type)) { - return $this->helper->check_combined_hash($password, $stored_hash_type, $hash); } - return $stored_hash_type->check($password, $hash); if ($stored_hash_type->get_type() !== $this->type) { - // check with "old" hash and convert to new one - } - else - { - // check with default type + $this->convert_flag = true; } + + return $stored_hash_type->check($password, $hash); } } |