diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-12-29 16:33:09 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-12-29 16:33:09 +0100 |
| commit | 808c54fa89f556e6f4701d4f8c6c418393ddfc13 (patch) | |
| tree | 928d41159e537f59751e9fd5e3a08945c7174cf9 /phpBB/phpbb/passwords/driver/bcrypt.php | |
| parent | 555cd025b2d53e681dd02756f7de3ba0bf7df321 (diff) | |
| download | forums-808c54fa89f556e6f4701d4f8c6c418393ddfc13.tar forums-808c54fa89f556e6f4701d4f8c6c418393ddfc13.tar.gz forums-808c54fa89f556e6f4701d4f8c6c418393ddfc13.tar.bz2 forums-808c54fa89f556e6f4701d4f8c6c418393ddfc13.tar.xz forums-808c54fa89f556e6f4701d4f8c6c418393ddfc13.zip | |
[feature/passwords] Get rid of unneeded code complexity
Simplified a little bit of code as pointed out by imkingdavid on github.
PHPBB3-11610
Diffstat (limited to 'phpBB/phpbb/passwords/driver/bcrypt.php')
| -rw-r--r-- | phpBB/phpbb/passwords/driver/bcrypt.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/phpbb/passwords/driver/bcrypt.php b/phpBB/phpbb/passwords/driver/bcrypt.php index 1d1b1e267d..b16d2ada56 100644 --- a/phpBB/phpbb/passwords/driver/bcrypt.php +++ b/phpBB/phpbb/passwords/driver/bcrypt.php @@ -29,9 +29,8 @@ class bcrypt extends base */ public function hash($password, $salt = '') { - // The 2x and 2y prefixes of bcrypt might not be supported - // Revert to 2a if this is the case - $prefix = (!$this->is_supported()) ? '$2a$' : $this->get_prefix(); + // Get prefix of this driver + $prefix = $this->get_prefix(); // Do not support 8-bit characters with $2a$ bcrypt // Also see http://www.php.net/security/crypt_blowfish.php |