Skip to content

gh-111178: fix UBSan failures in Modules/{blake2,md5,sha1,sha2,sha3}module.c #128248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encukou merged 14 commits into from
Jan 27, 2025
Merged

gh-111178: fix UBSan failures in Modules/{blake2,md5,sha1,sha2,sha3}module.c #128248

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4774f0c
fix UBSan failures in `sha3module.c`
picnixz Dec 23, 2024
d4179e1
fix UBSan failures in `sha2module.c`
picnixz Dec 23, 2024
83b696b
fix UBSan failures in `sha1module.c`
picnixz Dec 23, 2024
a0e2b2a
fix UBSan failures in `md5module.c`
picnixz Dec 23, 2024
e43effb
suppress unused return values
picnixz Dec 23, 2024
ecf78f9
remove redundant casts in constructors
picnixz Dec 23, 2024
d9452e8
suppress unused parameters in `{md5,sha*}module.c`
picnixz Dec 23, 2024
61a0de8
fix UBSan failures for `blake2module.c`
picnixz Dec 25, 2024
568bff8
suppress unused parameters in `blake2module.c`
picnixz Dec 25, 2024
494565a
Merge remote-tracking branch 'upstream/main' into fix/ubsan/sha-111178
picnixz Jan 14, 2025
3d85690
reduce diff
picnixz Jan 14, 2025
34e8b55
reduce diff
picnixz Jan 14, 2025
20bf303
reduce diff
picnixz Jan 14, 2025
e06f834
Merge branch 'main' into fix/ubsan/sha-111178
picnixz Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
reduce diff
  • Loading branch information
@picnixz
picnixz committed Jan 14, 2025
commit 3d856908e83fb6b4753f3a5bf4c7f01c429b7988
2 changes: 1 addition & 1 deletion Modules/blake2module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ static PyGetSetDef py_blake2b_getsetters[] = {
{"name", py_blake2b_get_name, NULL, NULL, NULL},
{"block_size", py_blake2b_get_block_size, NULL, NULL, NULL},
{"digest_size", py_blake2b_get_digest_size, NULL, NULL, NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
{NULL} /* Sentinel */
};


Expand Down
2 changes: 1 addition & 1 deletion Modules/md5module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ static PyGetSetDef MD5_getseters[] = {
{"block_size", MD5_get_block_size, NULL, NULL, NULL},
{"name", MD5_get_name, NULL, NULL, NULL},
{"digest_size", md5_get_digest_size, NULL, NULL, NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
{NULL} /* Sentinel */
};

static PyType_Slot md5_type_slots[] = {
Expand Down
2 changes: 1 addition & 1 deletion Modules/sha1module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ static PyGetSetDef SHA1_getseters[] = {
{"block_size", SHA1_get_block_size, NULL, NULL, NULL},
{"name", SHA1_get_name, NULL, NULL, NULL},
{"digest_size", sha1_get_digest_size, NULL, NULL, NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
{NULL} /* Sentinel */
};

static PyType_Slot sha1_type_slots[] = {
Expand Down
4 changes: 2 additions & 2 deletions Modules/sha2module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,14 +492,14 @@ static PyGetSetDef SHA256_getseters[] = {
{"block_size", SHA256_get_block_size, NULL, NULL, NULL},
{"name", SHA256_get_name, NULL, NULL, NULL},
{"digest_size", SHA256_get_digest_size, NULL, NULL, NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
{NULL} /* Sentinel */
};

static PyGetSetDef SHA512_getseters[] = {
{"block_size", SHA512_get_block_size, NULL, NULL, NULL},
{"name", SHA512_get_name, NULL, NULL, NULL},
{"digest_size", SHA512_get_digest_size, NULL, NULL, NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
{NULL} /* Sentinel */
};

static PyType_Slot sha256_types_slots[] = {
Expand Down
2 changes: 1 addition & 1 deletion Modules/sha3module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ static PyGetSetDef SHA3_getseters[] = {
{"_capacity_bits", SHA3_get_capacity_bits, NULL, NULL, NULL},
{"_rate_bits", SHA3_get_rate_bits, NULL, NULL, NULL},
{"_suffix", SHA3_get_suffix, NULL, NULL, NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
{NULL} /* Sentinel */
};

#define SHA3_TYPE_SLOTS(type_slots_obj, type_doc, type_methods, type_getseters) \
Expand Down