Skip to content

gh-99108: Refactor _sha256 & _sha512 into _sha2. #101924

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
gpshead merged 13 commits into from
Feb 16, 2023
Merged

gh-99108: Refactor _sha256 & _sha512 into _sha2. #101924

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fea4cdf
gh-99108: Refactor _sha256 & _sha512 into _sha2.
gpshead Feb 15, 2023
30c9955
update stdlib module names list.
gpshead Feb 15, 2023
4c6a4fb
remove the added subTest calls (no real value).
gpshead Feb 15, 2023
cf6b330
cleanup per review comments.
gpshead Feb 15, 2023
610cf36
rename the _sha2 types and simplify module init to use PyModule_AddType.
gpshead Feb 15, 2023
40fd92a
Explicitly test that direct type constructors fail.
gpshead Feb 15, 2023
d379e28
missing param
gpshead Feb 15, 2023
fb6454d
remove the unconstructable test (not a valid constraint for everything)
gpshead Feb 15, 2023
32b8f91
Merge branch 'main' into build/sha2
gpshead Feb 16, 2023
b7259c3
fix compiler warnings.
gpshead Feb 16, 2023
cbd04b0
Merge branch 'build/sha2' of github.com:gpshead/cpython into build/sha2
gpshead Feb 16, 2023
bc52384
Merge remote-tracking branch 'upstream/main' into build/sha2
gpshead Feb 16, 2023
b67918d
rename LIBHACL_ make vars to LIBHACL_SHA2_
gpshead Feb 16, 2023
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
rename the _sha2 types and simplify module init to use PyModule_AddType.
  • Loading branch information
@gpshead
gpshead authored Feb 15, 2023
commit 610cf3682b6950e120aa324e758bcd51909b9821
24 changes: 8 additions & 16 deletions Modules/sha2module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,31 +484,31 @@ static PyType_Slot sha512_type_slots[] = {
// Using PyType_GetModuleState() on these types is safe since they
// cannot be subclassed: they don't have the Py_TPFLAGS_BASETYPE flag.
static PyType_Spec sha224_type_spec = {
.name = "_sha2.sha224",
.name = "_sha2.SHA224Type",
.basicsize = sizeof(SHA256object),
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION |
Py_TPFLAGS_IMMUTABLETYPE | Py_TPFLAGS_HAVE_GC),
.slots = sha256_types_slots
};

static PyType_Spec sha256_type_spec = {
.name = "_sha2.sha256",
.name = "_sha2.SHA256Type",
.basicsize = sizeof(SHA256object),
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION |
Py_TPFLAGS_IMMUTABLETYPE | Py_TPFLAGS_HAVE_GC),
.slots = sha256_types_slots
};

static PyType_Spec sha384_type_spec = {
.name = "_sha2.sha384",
.name = "_sha2.SHA384Type",
.basicsize = sizeof(SHA512object),
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION |
Py_TPFLAGS_IMMUTABLETYPE | Py_TPFLAGS_HAVE_GC),
.slots = sha512_type_slots
};

static PyType_Spec sha512_type_spec = {
.name = "_sha2.sha512",
.name = "_sha2.SHA512Type",
.basicsize = sizeof(SHA512object),
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION |
Py_TPFLAGS_IMMUTABLETYPE | Py_TPFLAGS_HAVE_GC),
Expand Down Expand Up @@ -765,24 +765,16 @@ static int sha2_exec(PyObject *module)
return -1;
}

Py_INCREF((PyObject *)state->sha224_type);
if (PyModule_AddObject(module, "SHA224Type", (PyObject *)state->sha224_type) < 0) {
Py_DECREF((PyObject *)state->sha224_type);
if (PyModule_AddType((PyObject *)state->sha224_type) < 0) {
return -1;
}
Py_INCREF((PyObject *)state->sha256_type);
if (PyModule_AddObject(module, "SHA256Type", (PyObject *)state->sha256_type) < 0) {
Py_DECREF((PyObject *)state->sha256_type);
if (PyModule_AddType((PyObject *)state->sha256_type) < 0) {
return -1;
}
Py_INCREF((PyObject *)state->sha384_type);
if (PyModule_AddObject(module, "SHA384Type", (PyObject *)state->sha384_type) < 0) {
Py_DECREF((PyObject *)state->sha384_type);
if (PyModule_AddType((PyObject *)state->sha384_type) < 0) {
return -1;
}
Py_INCREF((PyObject *)state->sha512_type);
if (PyModule_AddObject(module, "SHA512Type", (PyObject *)state->sha512_type) < 0) {
Py_DECREF((PyObject *)state->sha512_type);
if (PyModule_AddType((PyObject *)state->sha512_type) < 0) {
return -1;
}

Expand Down