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
9b8c2e76
Commit
9b8c2e76
authored
Oct 11, 2018
by
Serhiy Storchaka
Committed by
GitHub
Oct 11, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-34922: Fix integer overflow in the digest() and hexdigest() methods (GH-9751)
for the SHAKE algorithm in the hashlib module.
parent
f1aa8aed
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
0 deletions
+20
-0
Lib/test/test_hashlib.py
Lib/test/test_hashlib.py
+13
-0
Misc/NEWS.d/next/Library/2018-10-07-21-18-52.bpo-34922.37IdsA.rst
...S.d/next/Library/2018-10-07-21-18-52.bpo-34922.37IdsA.rst
+3
-0
Modules/_sha3/sha3module.c
Modules/_sha3/sha3module.c
+4
-0
No files found.
Lib/test/test_hashlib.py
View file @
9b8c2e76
...
@@ -230,6 +230,19 @@ class HashLibTestCase(unittest.TestCase):
...
@@ -230,6 +230,19 @@ class HashLibTestCase(unittest.TestCase):
self
.
assertIsInstance
(
h
.
digest
(),
bytes
)
self
.
assertIsInstance
(
h
.
digest
(),
bytes
)
self
.
assertEqual
(
hexstr
(
h
.
digest
()),
h
.
hexdigest
())
self
.
assertEqual
(
hexstr
(
h
.
digest
()),
h
.
hexdigest
())
def
test_digest_length_overflow
(
self
):
# See issue #34922
large_sizes
=
(
2
**
29
,
2
**
32
-
10
,
2
**
32
+
10
,
2
**
61
,
2
**
64
-
10
,
2
**
64
+
10
)
for
cons
in
self
.
hash_constructors
:
h
=
cons
()
if
h
.
name
not
in
self
.
shakes
:
continue
for
digest
in
h
.
digest
,
h
.
hexdigest
:
self
.
assertRaises
(
ValueError
,
digest
,
-
10
)
for
length
in
large_sizes
:
with
self
.
assertRaises
((
ValueError
,
OverflowError
)):
digest
(
length
)
def
test_name_attribute
(
self
):
def
test_name_attribute
(
self
):
for
cons
in
self
.
hash_constructors
:
for
cons
in
self
.
hash_constructors
:
h
=
cons
()
h
=
cons
()
...
...
Misc/NEWS.d/next/Library/2018-10-07-21-18-52.bpo-34922.37IdsA.rst
0 → 100644
View file @
9b8c2e76
Fixed integer overflow in the :meth:`~hashlib.shake.digest()` and
:meth:`~hashlib.shake.hexdigest()` methods for the SHAKE algorithm
in the :mod:`hashlib` module.
Modules/_sha3/sha3module.c
View file @
9b8c2e76
...
@@ -589,6 +589,10 @@ _SHAKE_digest(SHA3object *self, unsigned long digestlen, int hex)
...
@@ -589,6 +589,10 @@ _SHAKE_digest(SHA3object *self, unsigned long digestlen, int hex)
int
res
;
int
res
;
PyObject
*
result
=
NULL
;
PyObject
*
result
=
NULL
;
if
(
digestlen
>=
(
1
<<
29
))
{
PyErr_SetString
(
PyExc_ValueError
,
"length is too large"
);
return
NULL
;
}
/* ExtractLane needs at least SHA3_MAX_DIGESTSIZE + SHA3_LANESIZE and
/* ExtractLane needs at least SHA3_MAX_DIGESTSIZE + SHA3_LANESIZE and
* SHA3_LANESIZE extra space.
* SHA3_LANESIZE extra space.
*/
*/
...
...
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