diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2015-05-07 09:44:53 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2015-05-07 09:44:53 +0200 |
| commit | db1083d69c2cef76478b675f190ca81162f4037e (patch) | |
| tree | cf3817a70c8132b9d40b60708672d722420fdc79 /inc | |
| parent | af865bf3762dff1ddfeb3bd15be46b605499a58b (diff) | |
| parent | 99a5b03f106be4dd58ea09dd0613e4a496f9c06a (diff) | |
| download | rpg-db1083d69c2cef76478b675f190ca81162f4037e.tar.gz rpg-db1083d69c2cef76478b675f190ca81162f4037e.tar.bz2 | |
Merge pull request #1136 from tled/bcrypt_hash
mysqlauth: bcrypt hash is indicated by 2a or 2y
Diffstat (limited to 'inc')
| -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}') { |