md5 now uses smaller salt

fixes #13891
2016-01-14 10:24:34 -05:00 · 2016-01-14 10:24:34 -05:00 · 27f9b9dc43
commit 27f9b9dc43
parent 31a951c4f7
1 changed files with 5 additions and 1 deletions
--- a/lib/ansible/plugins/filter/core.py
+++ b/lib/ansible/plugins/filter/core.py
@ -225,7 +225,11 @@ def get_encrypted_password(password, hashtype='sha512', salt=None):
    if hashtype in cryptmethod:
        if salt is None:
            r = SystemRandom()
-            salt = ''.join([r.choice(string.ascii_letters + string.digits) for _ in range(16)])
+            if hashtype in ['md5']:
+                saltsize = 8
+            else:
+                saltsize = 16
+            salt = ''.join([r.choice(string.ascii_letters + string.digits) for _ in range(saltsize)])

        if not HAS_PASSLIB:
            if sys.platform.startswith('darwin'):