summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-08-13 23:40:46 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-08-13 23:40:46 (GMT)
commitfc8a0a7b82e9cb9434269bf64bd018882098d88c (patch)
tree30898977bd50e27752fc7b516c1a127c0276b2e2 /Lib
parent97869103ba09fb6a468312d303193902ff13160a (diff)
parent7f7b941fdcdfe28f3cd37e84bc5d7a298385b451 (diff)
downloadcpython-fc8a0a7b82e9cb9434269bf64bd018882098d88c.zip
cpython-fc8a0a7b82e9cb9434269bf64bd018882098d88c.tar.gz
cpython-fc8a0a7b82e9cb9434269bf64bd018882098d88c.tar.bz2
(Merge 3.3) Issue #18405: Improve the entropy of crypt.mksalt().
Diffstat (limited to 'Lib')
-rw-r--r--Lib/crypt.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/crypt.py b/Lib/crypt.py
index b90c81c..49ab96e 100644
--- a/Lib/crypt.py
+++ b/Lib/crypt.py
@@ -28,7 +28,7 @@ def mksalt(method=None):
if method is None:
method = methods[0]
s = '${}$'.format(method.ident) if method.ident else ''
- s += ''.join(_sr.sample(_saltchars, method.salt_chars))
+ s += ''.join(_sr.choice(_saltchars) for char in range(method.salt_chars))
return s