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

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
This commit is contained in:
Luke Plant 2010-10-15 11:11:08 +00:00
parent 7f5698de1d
commit d81b3aa739
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/utils/crypto.py
View File

@ -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):