diff options
Diffstat (limited to 'passlib/tests')
| -rw-r--r-- | passlib/tests/test_context.py | 29 | ||||
| -rw-r--r-- | passlib/tests/test_utils_handlers.py | 4 |
2 files changed, 18 insertions, 15 deletions
diff --git a/passlib/tests/test_context.py b/passlib/tests/test_context.py index f788ee9..efeaaeb 100644 --- a/passlib/tests/test_context.py +++ b/passlib/tests/test_context.py @@ -581,7 +581,8 @@ class CryptContextTest(TestCase): #policy adaptation #========================================================= sample_policy_1 = dict( - schemes = [ "des_crypt", "md5_crypt", "nthash", "bsdi_crypt", "sha256_crypt"], + schemes = [ "des_crypt", "md5_crypt", "phpass", "bsdi_crypt", + "sha256_crypt"], deprecated = [ "des_crypt", ], default = "sha256_crypt", bsdi_crypt__max_rounds = 30, @@ -590,29 +591,31 @@ class CryptContextTest(TestCase): sha256_crypt__max_rounds = 3000, sha256_crypt__min_rounds = 2000, sha256_crypt__default_rounds = 3000, - nthash__ident = "NT", + phpass__ident = "H", + phpass__default_rounds = 7, ) def test_10_01_genconfig_settings(self): "test genconfig() settings" cc = CryptContext(policy=None, - schemes=["md5_crypt", "nthash"], - nthash__ident="NT", + schemes=["md5_crypt", "phpass"], + phpass__ident="H", + phpass__default_rounds=7, ) # hash specific settings self.assertTrue(cc.genconfig().startswith("$1$")) self.assertEqual( - cc.genconfig(scheme="nthash"), - '$NT$00000000000000000000000000000000', + cc.genconfig(scheme="phpass", salt='.'*8), + '$H$5........', ) self.assertEqual( - cc.genconfig(scheme="nthash", ident="3"), - '$3$$00000000000000000000000000000000', + cc.genconfig(scheme="phpass", salt='.'*8, rounds=8, ident='P'), + '$P$6........', ) # unsupported hash settings should be rejected - self.assertRaises(KeyError, cc.replace, md5_crypt__ident="NT") + self.assertRaises(KeyError, cc.replace, md5_crypt__ident="P") def test_10_02_genconfig_rounds_limits(self): "test genconfig() policy rounds limits" @@ -804,12 +807,12 @@ class CryptContextTest(TestCase): # hash specific settings self.assertEqual( - cc.encrypt("password", scheme="nthash"), - '$NT$8846f7eaee8fb117ad06bdd830b7586c', + cc.encrypt("password", scheme="phpass", salt='.'*8), + '$H$5........De04R5Egz0aq8Tf.1eVhY/', ) self.assertEqual( - cc.encrypt("password", scheme="nthash", ident="3"), - '$3$$8846f7eaee8fb117ad06bdd830b7586c', + cc.encrypt("password", scheme="phpass", salt='.'*8, ident="P"), + '$P$5........De04R5Egz0aq8Tf.1eVhY/', ) # NOTE: more thorough job of rounds limits done in genconfig() test, diff --git a/passlib/tests/test_utils_handlers.py b/passlib/tests/test_utils_handlers.py index 9b28f3c..7079917 100644 --- a/passlib/tests/test_utils_handlers.py +++ b/passlib/tests/test_utils_handlers.py @@ -512,9 +512,9 @@ class PrefixWrapperTest(TestCase): "{XXX}", ident="{XXXX") # test ident_values is proxied - h = uh.PrefixWrapper("h4", "bcrypt", "{XXX}") + h = uh.PrefixWrapper("h4", "phpass", "{XXX}") self.assertIs(h.ident, None) - self.assertEqual(h.ident_values, [ u("{XXX}$2$"), u("{XXX}$2a$") ]) + self.assertEqual(h.ident_values, [ u("{XXX}$P$"), u("{XXX}$H$") ]) #========================================================= #sample algorithms - these serve as known quantities |