From a058a0ba8b585ad65d9cd0c142f752124c8b4165 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 18 Jul 2012 12:34:26 -0500
Subject: [PATCH] fixed an issue with latest CRYPT

---
 VERSION             | 2 +-
 gluon/validators.py | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index e1d7cada..dea219ba 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-18 12:24:23) dev
+Version 2.00.0 (2012-07-18 12:34:21) dev
diff --git a/gluon/validators.py b/gluon/validators.py
index 3aceaccd..6d14fcd2 100644
--- a/gluon/validators.py
+++ b/gluon/validators.py
@@ -2570,8 +2570,11 @@ class LazyCrypt(object):
         else:
             salt = ''
         masterkey = key+salt
-        h = simple_hash(self.password, masterkey, digest_alg)
-        self.crypted = '%s$%s$%s' % (digest_alg, salt, h)
+        hashed = simple_hash(self.password, masterkey, digest_alg)
+        if salt:
+            self.crypted = '%s$%s$%s' % (digest_alg, salt, hashed)
+        else:
+            self.crypted = hashed
         return self.crypted
 
     def __eq__(self, stored_password):