Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
f6da4ba1
Commit
f6da4ba1
authored
Jun 27, 2012
by
Christian Heimes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue 10924: Fixed mksalt() to use a RNG that is suitable for cryptographic purpose
parent
4f392e2f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
7 deletions
+18
-7
Lib/crypt.py
Lib/crypt.py
+8
-7
Misc/NEWS
Misc/NEWS
+10
-0
No files found.
Lib/crypt.py
View file @
f6da4ba1
"""Wrapper to the POSIX crypt library call and associated functionality."""
import
_crypt
import
string
from
random
import
choice
from
collections
import
namedtuple
import
string
as
_string
from
random
import
SystemRandom
as
_SystemRandom
from
collections
import
namedtuple
as
_namedtuple
_saltchars
=
string
.
ascii_letters
+
string
.
digits
+
'./'
_saltchars
=
_string
.
ascii_letters
+
_string
.
digits
+
'./'
_sr
=
_SystemRandom
()
class
_Method
(
namedtuple
(
'_Method'
,
'name ident salt_chars total_size'
)):
class
_Method
(
_
namedtuple
(
'_Method'
,
'name ident salt_chars total_size'
)):
"""Class representing a salt method per the Modular Crypt Format or the
legacy 2-character crypt method."""
...
...
@@ -18,7 +19,6 @@ class _Method(namedtuple('_Method', 'name ident salt_chars total_size')):
return
'<crypt.METHOD_{}>'
.
format
(
self
.
name
)
def
mksalt
(
method
=
None
):
"""Generate a salt for the specified method.
...
...
@@ -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
(
choice
(
_saltchars
)
for
_
in
range
(
method
.
salt_chars
))
s
+=
''
.
join
(
_sr
.
sample
(
_saltchars
,
method
.
salt_chars
))
return
s
...
...
@@ -60,3 +60,4 @@ for _method in (METHOD_SHA512, METHOD_SHA256, METHOD_MD5):
methods
.
append
(
_method
)
methods
.
append
(
METHOD_CRYPT
)
del
_result
,
_method
Misc/NEWS
View file @
f6da4ba1
...
...
@@ -7,6 +7,16 @@ What's New in Python 3.3.0 Beta 2?
*Release date: xx-xxx-2012*
Core and Builtins
-----------------
Library
-------
- Issue 10924: Fixed mksalt() to use a RNG that is suitable for cryptographic
purpose.
Extension Modules
-----------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment