error message on Crypt exception

2012-07-05 10:47:10 -05:00
parent 0d8d8817f4
commit bee3c154ef
2 changed files with 3 additions and 1 deletions
@@ -1 +1 @@
-Version 2.00.0 (2012-07-05 09:31:20) dev
+Version 2.00.0 (2012-07-05 10:47:05) dev
@@ -2539,6 +2539,8 @@ class LazyCrypt(object):
        if self.crypted:
            return self.crypted
        if self.crypt.salt:
+            if not self.crypt.key:
+                raise RuntimeError, "CRYPT has salt but not key"
            if self.crypt.salt == True:                
                salt = str(web2py_uuid()).replace('-','')[-16:]                                                     
            else: