diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-09 22:53:13 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-09 22:53:13 +0200 |
| commit | cd74fb094629cf07209b4fa13ebf0ddf5b4ce47c (patch) | |
| tree | 343dbdf6fdd3e87788e10479e88cf19f584cd6e3 /phpBB/phpbb/passwords | |
| parent | 3b6038cfcd6e00aaf8e9b5f68f2a925c9a85da51 (diff) | |
| download | forums-cd74fb094629cf07209b4fa13ebf0ddf5b4ce47c.tar forums-cd74fb094629cf07209b4fa13ebf0ddf5b4ce47c.tar.gz forums-cd74fb094629cf07209b4fa13ebf0ddf5b4ce47c.tar.bz2 forums-cd74fb094629cf07209b4fa13ebf0ddf5b4ce47c.tar.xz forums-cd74fb094629cf07209b4fa13ebf0ddf5b4ce47c.zip | |
[feature/passwords] Increase test coverage to 35 out ouf 36 methods
Only one small code part in the salted md5 driver can't be tested right now.
Passwords helper and passwords driver helper are now fully covered by tests.
PHPBB3-11610
Diffstat (limited to 'phpBB/phpbb/passwords')
| -rw-r--r-- | phpBB/phpbb/passwords/driver/helper.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/salted_md5.php | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/phpbb/passwords/driver/helper.php b/phpBB/phpbb/passwords/driver/helper.php index da66347ac3..086edb6b65 100644 --- a/phpBB/phpbb/passwords/driver/helper.php +++ b/phpBB/phpbb/passwords/driver/helper.php @@ -120,12 +120,13 @@ class helper * Get random salt with specified length * * @param int $length Salt length + * @param string $rand_seed Seed for random data (optional). For tests. */ - public function get_random_salt($length) + public function get_random_salt($length, $rand_seed = '/dev/urandom') { $random = ''; - if (($fh = @fopen('/dev/urandom', 'rb'))) + if (($fh = @fopen($rand_seed, 'rb'))) { $random = fread($fh, $length); fclose($fh); diff --git a/phpBB/phpbb/passwords/driver/salted_md5.php b/phpBB/phpbb/passwords/driver/salted_md5.php index 13d25560fe..23ae25c0c9 100644 --- a/phpBB/phpbb/passwords/driver/salted_md5.php +++ b/phpBB/phpbb/passwords/driver/salted_md5.php @@ -46,10 +46,7 @@ class salted_md5 extends \phpbb\passwords\driver\base } else { - if (($settings = $this->get_hash_settings($this->generate_salt())) === false) - { - return false; - } + $settings = $this->get_hash_settings($this->generate_salt()); } $hash = md5($settings['salt'] . $password, true); |