Commit d81b3aa7 authored by Luke Plant's avatar Luke Plant
Browse files

Fixed Python 2.4 incompatibility introduced in [14218] 

sha_constructor was incorrectly used instead of sha_hmac (which only made a
difference under 2.4).

Thanks to Steffan Kaminski for report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 7f5698de

django/utils/crypto.py

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Django's standard crypto functions and utilities. 
import hmac



from django.conf import settings

from django.utils.hashcompat import sha_constructor

from django.utils.hashcompat import sha_constructor, sha_hmac





def salted_hmac(key_salt, value, secret=None):
@@ -28,7 +28,7 @@ def salted_hmac(key_salt, value, secret=None): 
    # the hmac module does the same thing for keys longer than the block size.

    # However, we need to ensure that we *always* do this.



    return hmac.new(key, msg=value, digestmod=sha_constructor)

    return hmac.new(key, msg=value, digestmod=sha_hmac)





def constant_time_compare(val1, val2):