diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2014-02-02 14:57:43 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-02-02 14:57:43 +0100 |
| commit | b094c7999660703370566018bf449a9280148b8d (patch) | |
| tree | f5f1161c3fb4d9ac6e2bf02686d471d2651d6930 /tests/passwords | |
| parent | [feature/passwords] Add support for passwords driver service name in hash() (diff) | |
| download | phpbb-b094c7999660703370566018bf449a9280148b8d.tar.gz phpbb-b094c7999660703370566018bf449a9280148b8d.tar.bz2 phpbb-b094c7999660703370566018bf449a9280148b8d.zip | |
[feature/passwords] Move combined hashing methods to manager
This will get rid of the circular dependency between the passwords manager
and the passwords helper. The combined_hash_password() method was also
slightly changed to allow both the definitions of service names or prefixes
for the hash types.
PHPBB3-11610
Diffstat (limited to 'tests/passwords')
| -rw-r--r-- | tests/passwords/manager_test.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/passwords/manager_test.php b/tests/passwords/manager_test.php index 11efaa5afd..ee295ff043 100644 --- a/tests/passwords/manager_test.php +++ b/tests/passwords/manager_test.php @@ -198,6 +198,10 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase array('passwords.driver.salted_md5'), false, ), + array( + '$H$', + array('$2a$'), + ), ); } else @@ -229,6 +233,10 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase array('passwords.driver.salted_md4'), false, ), + array( + '$H$', + array('$2y$'), + ), ); } } |