Mercurial > public > src > rhodecode
changeset 1244:336bbc3a89ca demo
merge default with demo
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 22 Mar 2011 12:06:26 +0100 |
parents | 7fe929330d85 (current diff) 7327a0d1584c (diff) |
children | 885010566ed4 |
files | |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/auth.py Mon Mar 21 23:06:25 2011 +0100 +++ b/rhodecode/lib/auth.py Tue Mar 22 12:06:26 2011 +0100 @@ -106,9 +106,9 @@ :param hashed: password in hashed form """ - if __platform__ == 'Windows': + if __platform__ in PLATFORM_WIN: return sha256(password).hexdigest() == hashed - elif __platform__ in ('Linux', 'Darwin'): + elif __platform__ in PLATFORM_OTHERS: return bcrypt.hashpw(password, hashed) == hashed else: raise Exception('Unknown or unsupported platform %s' % __platform__)