p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Increased pbkdf2 scaling test vectors to lower chance of false test failures. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Paul McMillan 2011-12-30 20:35:44 +00:00
parent ffb0519d44
commit 1fed65224f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/regressiontests/utils/crypto.py
View File

@ -125,9 +125,11 @@ class TestUtilsCryptoPBKDF2(unittest.TestCase):
Theory: If you run with 100 iterations, it should take 100 Theory: If you run with 100 iterations, it should take 100
times as long as running with 1 iteration. times as long as running with 1 iteration.
""" """
n1, n2 = 100, 10000 n1, n2 = 1000, 100000
elapsed = lambda f: timeit.Timer(f, 'from django.utils.crypto import pbkdf2').timeit(number=1) elapsed = lambda f: timeit.Timer(f, 'from django.utils.crypto import pbkdf2').timeit(number=1)
t1 = elapsed('pbkdf2("password", "salt", iterations=%d)' % n1) t1 = elapsed('pbkdf2("password", "salt", iterations=%d)' % n1)
t2 = elapsed('pbkdf2("password", "salt", iterations=%d)' % n2) t2 = elapsed('pbkdf2("password", "salt", iterations=%d)' % n2)
measured_scale_exponent = math.log(t2 / t1, n2 / n1) measured_scale_exponent = math.log(t2 / t1, n2 / n1)
#This should be less than 1. We allow up to 1.1 so that tests don't
#fail nondeterministically too often.
self.assertLess(measured_scale_exponent, 1.1) self.assertLess(measured_scale_exponent, 1.1)