diff options
author | Marc Alexander <admin@m-a-styles.de> | 2013-10-03 10:04:59 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-03 10:04:59 +0200 |
commit | 7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c (patch) | |
tree | aceb567afda7467738ab6b693dc9595a40ac7f2f /tests/security | |
parent | [feature/passwords] Add prepending backslash to class namespaces (diff) | |
parent | Merge remote-tracking branch 'nickvergessen/ticket/11691' into develop (diff) | |
download | phpbb-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.gz phpbb-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.bz2 phpbb-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.zip |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
phpBB/includes/functions.php
Diffstat (limited to 'tests/security')
-rw-r--r-- | tests/security/hash_test.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php index 76d7d22a00..f7d2c0dad8 100644 --- a/tests/security/hash_test.php +++ b/tests/security/hash_test.php @@ -44,5 +44,13 @@ class phpbb_security_hash_test extends phpbb_test_case $this->assertTrue(phpbb_check_hash('test', '$P$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); $this->assertFalse(phpbb_check_hash('foo', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); } + + public function test_check_hash_with_large_input() + { + // 16 MB password, should be rejected quite fast + $start_time = time(); + $this->assertFalse(phpbb_check_hash(str_repeat('a', 1024 * 1024 * 16), '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); + $this->assertLessThanOrEqual(5, time() - $start_time); + } } |