diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-08-22 19:31:35 -0500 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-14 13:55:53 +0200 |
| commit | b810957c4bc4ffa86dd4db4cce26bd49d7008670 (patch) | |
| tree | 057ac5ea093530b6aac63b4b9d3ce1b447815a41 | |
| parent | 8b9370c6a956447be304b609eb63d029cb19f2dc (diff) | |
| download | forums-b810957c4bc4ffa86dd4db4cce26bd49d7008670.tar forums-b810957c4bc4ffa86dd4db4cce26bd49d7008670.tar.gz forums-b810957c4bc4ffa86dd4db4cce26bd49d7008670.tar.bz2 forums-b810957c4bc4ffa86dd4db4cce26bd49d7008670.tar.xz forums-b810957c4bc4ffa86dd4db4cce26bd49d7008670.zip | |
[feature/passwords] Properly set convert_flag and add test for it
PHPBB3-11610
| -rw-r--r-- | phpBB/phpbb/crypto/manager.php | 6 | ||||
| -rw-r--r-- | tests/crypto/manager_test.php | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/phpbb/crypto/manager.php b/phpBB/phpbb/crypto/manager.php index e314b08865..885bf719bf 100644 --- a/phpBB/phpbb/crypto/manager.php +++ b/phpBB/phpbb/crypto/manager.php @@ -196,10 +196,14 @@ class phpbb_crypto_manager return $this->helper->check_combined_hash($password, $stored_hash_type, $hash); } - if ($stored_hash_type->get_type() !== $this->type) + if ($stored_hash_type->get_name() !== $this->type) { $this->convert_flag = true; } + else + { + $this->convert_flag = false; + } return $stored_hash_type->check($password, $hash); } diff --git a/tests/crypto/manager_test.php b/tests/crypto/manager_test.php index ceeb45b5b8..c396d092c1 100644 --- a/tests/crypto/manager_test.php +++ b/tests/crypto/manager_test.php @@ -126,6 +126,9 @@ class phpbb_crypto_manager_test extends PHPUnit_Framework_TestCase $password .= $this->pw_characters[mt_rand(0, 66)]; $this->assertEquals(false, $this->manager->check_hash($password, $hash)); } + + // Check if convert_flag is correctly set + $this->assertEquals(($hash_type !== 'crypto.driver.bcrypt_2y'), $this->manager->convert_flag); } |