innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Simplify (and very very slightly speed up) the pbkdf2 implementation

This commit is contained in:
Alex Gaynor 2013-11-04 09:45:27 -08:00
parent 9b95fa7777
commit 8ecba51ea0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
django/utils/crypto.py
View File

@ -152,15 +152,15 @@ def pbkdf2(password, salt, iterations, dklen=0, digest=None):
outer.update(password.translate(hmac.trans_5C)) outer.update(password.translate(hmac.trans_5C))
def F(i): def F(i):
def U(): u = salt + struct.pack(b'>I', i)
u = salt + struct.pack(b'>I', i) result = 0
for j in xrange(int(iterations)): for j in xrange(int(iterations)):
dig1, dig2 = inner.copy(), outer.copy() dig1, dig2 = inner.copy(), outer.copy()
dig1.update(u) dig1.update(u)
dig2.update(dig1.digest()) dig2.update(dig1.digest())
u = dig2.digest() u = dig2.digest()
yield _bin_to_long(u) result ^= _bin_to_long(u)
return _long_to_bin(reduce(operator.xor, U()), hex_format_string) return _long_to_bin(result, hex_format_string)
T = [F(x) for x in range(1, l + 1)] T = [F(x) for x in range(1, l)]
return b''.join(T[:-1]) + T[-1][:r] return b''.join(T) + F(l)[:r]