diff options
| author | Patrick Brown <ptbrown@whoopdedo.org> | 2015-05-07 21:10:22 -0400 |
|---|---|---|
| committer | Patrick Brown <ptbrown@whoopdedo.org> | 2015-05-07 21:10:22 -0400 |
| commit | d0d224a82eddf30aa6daead4796cb10dd0466767 (patch) | |
| tree | d04692b0379451db55b7dc556dee7be7846d3cc8 /inc/PassHash.class.php | |
| parent | 699e3c4900f2d6cc860a3587a05798cd23b7944d (diff) | |
| parent | cffb4528cea1b9e7e03dc724aaa9719dbd6e23c9 (diff) | |
| download | rpg-d0d224a82eddf30aa6daead4796cb10dd0466767.tar.gz rpg-d0d224a82eddf30aa6daead4796cb10dd0466767.tar.bz2 | |
Merge branch 'master' into ioreplaceinfile
Diffstat (limited to 'inc/PassHash.class.php')
| -rw-r--r-- | inc/PassHash.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php index 15f896dcf..0701c4116 100644 --- a/inc/PassHash.class.php +++ b/inc/PassHash.class.php @@ -50,7 +50,7 @@ class PassHash { } elseif(preg_match('/^md5\$(.{5})\$/', $hash, $m)) { $method = 'djangomd5'; $salt = $m[1]; - } elseif(preg_match('/^\$2a\$(.{2})\$/', $hash, $m)) { + } elseif(preg_match('/^\$2(a|y)\$(.{2})\$/', $hash, $m)) { $method = 'bcrypt'; $salt = $hash; } elseif(substr($hash, 0, 6) == '{SSHA}') { |