From: Jonathan Ellis <jbellis@gmail.com>
Date: Wed, 25 Jul 2007 19:00:14 +0000 (+0000)
Subject: use sha instead of crypt to decrease suckage for windows users.  also crypt kinda... 
X-Git-Tag: rel_0_4_6~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0effb191b761e3453c8f88c4591de751e7afc26e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

use sha instead of crypt to decrease suckage for windows users.  also crypt kinda blows anyway
---

diff --git a/test/zblog/user.py b/test/zblog/user.py
index 1dca0328ec..3e77fa8427 100644
--- a/test/zblog/user.py
+++ b/test/zblog/user.py
@@ -1,13 +1,7 @@
 """user.py - handles user login and validation"""
 
 import random, string
-try:
-    from crypt import crypt
-except:
-    try:
-        from fcrypt import crypt
-    except:
-        raise "Need fcrypt module on non-Unix platform:  http://home.clear.net.nz/pages/c.evans/sw/"
+from sha import sha
 
 administrator = 'admin'
 user = 'user'
@@ -16,7 +10,7 @@ groups = [user, administrator]
 def cryptpw(password, salt=None):
     if salt is None:
         salt = string.join([chr(random.randint(ord('a'), ord('z'))), chr(random.randint(ord('a'), ord('z')))],'')
-    return crypt(password, salt)
+    return sha(password + salt).hexdigest()
     
 def checkpw(password, dbpw):
     return cryptpw(password, dbpw[:2]) == dbpw