diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-28 15:02:59 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-28 15:02:59 +0200 |
| commit | 787784e08335ef3c8d0d2955a1687afcec0f4cf9 (patch) | |
| tree | b911ca7844e1abfa9879aac6dc2af3354d6a90c0 /phpBB/includes/functions.php | |
| parent | 08b49203b48dc0bf3e1d851776288483065cf399 (diff) | |
| parent | 02f9d179e541cf462e042774f6438263459926a3 (diff) | |
| download | forums-787784e08335ef3c8d0d2955a1687afcec0f4cf9.tar forums-787784e08335ef3c8d0d2955a1687afcec0f4cf9.tar.gz forums-787784e08335ef3c8d0d2955a1687afcec0f4cf9.tar.bz2 forums-787784e08335ef3c8d0d2955a1687afcec0f4cf9.tar.xz forums-787784e08335ef3c8d0d2955a1687afcec0f4cf9.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.12] Update changelog for 3.0.12 release.
[ticket/11873] Add unit test for large password input.
[ticket/11873] Do not hash very large passwords in order to safe resources.
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b3e50847fd..869396f6b7 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -442,6 +442,13 @@ function phpbb_hash($password) */ function phpbb_check_hash($password, $hash) { + if (strlen($password) > 4096) + { + // If the password is too huge, we will simply reject it + // and not let the server try to hash it. + return false; + } + $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; if (strlen($hash) == 34) { |