mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-29 11:45:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

(Merge 3.3) Issue #18405: Improve the entropy of crypt.mksalt().

Browse source
This commit is contained in:
Victor Stinner 2013-08-14 01:40:46 +02:00
commit fc8a0a7b82
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/crypt.py
View file

@ -28,7 +28,7 @@ def mksalt(method=None):
if method is None: if method is None:
method = methods[0] method = methods[0]
s = '${}$'.format(method.ident) if method.ident else '' 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 return s

2
Misc/NEWS
View file

@ -28,6 +28,8 @@ Core and Builtins
Library Library
------- -------
- Issue #18405: Improve the entropy of crypt.mksalt().
- Issue #12015: The tempfile module now uses a suffix of 8 random characters - Issue #12015: The tempfile module now uses a suffix of 8 random characters
instead of 6, to reduce the risk of filename collision. The entropy was instead of 6, to reduce the risk of filename collision. The entropy was
reduced when uppercase letters were removed from the charset used to generate reduced when uppercase letters were removed from the charset used to generate