summaryrefslogtreecommitdiff
path: root/passlib/apps.py
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2020-10-06 12:14:04 -0400
committerEli Collins <elic@assurancetechnologies.com>2020-10-06 12:14:04 -0400
commit0a25f664189515086d12aabacc0275b6b2ba209a (patch)
tree5e67f582d500d3f6fb7e57d8f6a58e78d3d99155 /passlib/apps.py
parent15f0486c44428351ba45e57e541e3e5c04019e01 (diff)
parentbf7afc81eff400c835fc43505ff6e2f91bf73fa9 (diff)
downloadpasslib-0a25f664189515086d12aabacc0275b6b2ba209a.tar.gz
Merge from stable
Diffstat (limited to 'passlib/apps.py')
-rw-r--r--passlib/apps.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/passlib/apps.py b/passlib/apps.py
index 9217d40..38c3500 100644
--- a/passlib/apps.py
+++ b/passlib/apps.py
@@ -123,9 +123,17 @@ django_context = django110_context
#=============================================================================
# ldap
#=============================================================================
-std_ldap_schemes = ["ldap_salted_sha1", "ldap_salted_md5",
- "ldap_sha1", "ldap_md5",
- "ldap_plaintext" ]
+
+#: standard ldap schemes
+std_ldap_schemes = [
+ "ldap_salted_sha512",
+ "ldap_salted_sha256",
+ "ldap_salted_sha1",
+ "ldap_salted_md5",
+ "ldap_sha1",
+ "ldap_md5",
+ "ldap_plaintext",
+]
# create context with all std ldap schemes EXCEPT crypt
ldap_nocrypt_context = LazyCryptContext(std_ldap_schemes)