Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.5.x] Fixed #21138 -- Increased the performance of our PBKDF2 implementation.

Browse Source 
Thanks go to Michael Gebetsroither for pointing out this issue and help on
the patch.

Backport of 68540fe4df44492571bc610a0a043d3d02b3d320 from master.
This commit is contained in:
Florian Apolloner 2013-09-17 22:59:56 +02:00
parent 1cc572a071
commit f3853172a4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/utils/crypto.py
View File

@ -122,9 +122,8 @@ def _fast_hmac(key, msg, digest):
This function operates on bytes. This function operates on bytes.
""" """
dig1, dig2 = digest(), digest() dig1, dig2 = digest(), digest()
if len(key) > dig1.block_size: if len(key) != dig1.block_size:
key = digest(key).digest() raise ValueError('Key size needs to match the block_size of the digest.')
key += b'\x00' * (dig1.block_size - len(key))
dig1.update(key.translate(_trans_36)) dig1.update(key.translate(_trans_36))
dig1.update(msg) dig1.update(msg)
dig2.update(key.translate(_trans_5c)) dig2.update(key.translate(_trans_5c))
@ -159,6 +158,11 @@ def pbkdf2(password, salt, iterations, dklen=0, digest=None):
hex_format_string = "%%0%ix" % (hlen * 2) hex_format_string = "%%0%ix" % (hlen * 2)
inner_digest_size = digest().block_size
if len(password) > inner_digest_size:
password = digest(password).digest()
password += b'\x00' * (inner_digest_size - len(password))
def F(i): def F(i):
def U(): def U():
u = salt + struct.pack(b'>I', i) u = salt + struct.pack(b'>I', i)