diff --git a/roundup/password.py b/roundup/password.py
index eab300775b9c8a7869904c08aebc21d528f69160..006c591be99cf39f6960b973bd3b48b8fa68b023 100644 (file)
--- a/roundup/password.py
+++ b/roundup/password.py
import re, string, random
from base64 import b64encode, b64decode
-from roundup.anypy.hashlib_ import md5, sha1
+from roundup.anypy.hashlib_ import md5, sha1, shamodule
try:
import crypt
except ImportError:
#no m2crypto - make our own pbkdf2 function
from struct import pack
from hmac import HMAC
- try:
- from hashlib import sha1
- except ImportError:
- from sha import new as sha1
def xor_bytes(left, right):
"perform bitwise-xor of two byte-strings"
def _pbkdf2(password, salt, rounds, keylen):
digest_size = 20 # sha1 generates 20-byte blocks
total_blocks = int((keylen+digest_size-1)/digest_size)
- hmac_template = HMAC(password, None, sha1)
+ hmac_template = HMAC(password, None, shamodule)
out = _bempty
for i in xrange(1, total_blocks+1):
hmac = hmac_template.copy()