Ticket #17481: pbkdf2.diff

./django/utils/crypto.py

@@ -75 +75 @@
     return long(x.encode('hex'), 16)
 
 
-def long_to_bin(x):
+def long_to_bin(x, length=0):
     """
     Convert a long integer into a binary string
     """
     hex = "%x" % (x)
     if len(hex) % 2 == 1:
         hex = '0' + hex
-    return binascii.unhexlify(hex)
+    bin = binascii.unhexlify(hex)
+    return chr(0)*(length-len(bin)) + bin
 
 
 def fast_hmac(key, msg, digest):
@@ -129 +130 @@
             for j in xrange(int(iterations)):
                 u = fast_hmac(password, u, digest).digest()
                 yield bin_to_long(u)
-        return long_to_bin(reduce(operator.xor, U()))
+        return long_to_bin(reduce(operator.xor, U()), hlen)
 
     T = [F(x) for x in range(1, l + 1)]
     return ''.join(T[:-1]) + T[-1][:r]