summaryrefslogtreecommitdiff
path: root/passlib/registry.py
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2011-04-29 16:18:38 -0400
committerEli Collins <elic@assurancetechnologies.com>2011-04-29 16:18:38 -0400
commit0a911f70599de598d65147dc9b19ead51ff9ab38 (patch)
tree5b846674cece38dea221271607c31f718fb8a7a6 /passlib/registry.py
parentc8d8eb0d9b1c753d342307b070fb1ad09cc351a6 (diff)
downloadpasslib-0a911f70599de598d65147dc9b19ead51ff9ab38.tar.gz
added ldap_pbkdf2_{digest} variants; UTs & docs; removed prefix from pdkdf2_sha1 for compat w/ existing hashes
Diffstat (limited to 'passlib/registry.py')
-rw-r--r--passlib/registry.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/passlib/registry.py b/passlib/registry.py
index 942f94b..46e38a6 100644
--- a/passlib/registry.py
+++ b/passlib/registry.py
@@ -103,6 +103,11 @@ _handler_locations = {
"ldap_sha1_crypt": ("passlib.handlers.ldap_digests","ldap_sha1_crypt"),
"ldap_sha256_crypt":("passlib.handlers.ldap_digests","ldap_sha256_crypt"),
"ldap_sha512_crypt":("passlib.handlers.ldap_digests","ldap_sha512_crypt"),
+ "ldap_pbkdf2_sha1": ("passlib.handlers.pbkdf2", "ldap_pbkdf2_sha1"),
+ "ldap_pbkdf2_sha256":
+ ("passlib.handlers.pbkdf2", "ldap_pbkdf2_sha256"),
+ "ldap_pbkdf2_sha512":
+ ("passlib.handlers.pbkdf2", "ldap_pbkdf2_sha512"),
"md5_crypt": ("passlib.handlers.md5_crypt", "md5_crypt"),
"mysql323": ("passlib.handlers.mysql", "mysql323"),
"mysql41": ("passlib.handlers.mysql", "mysql41"),
@@ -116,8 +121,6 @@ _handler_locations = {
"plaintext": ("passlib.handlers.misc", "plaintext"),
"postgres_md5": ("passlib.handlers.postgres", "postgres_md5"),
"roundup_plaintext":("passlib.handlers.roundup", "roundup_plaintext"),
- "roundup_pbkdf2_sha1":
- ("passlib.handlers.roundup", "roundup_pbkd2_sha1"),
"sha1_crypt": ("passlib.handlers.sha1_crypt", "sha1_crypt"),
"sha256_crypt": ("passlib.handlers.sha2_crypt", "sha256_crypt"),
"sha512_crypt": ("passlib.handlers.sha2_crypt", "sha512_crypt"),