Skip to content

bpo-1635741: port sha3 module to multi-phase init #21855

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
merged 10 commits into from
Sep 2, 2020
Merged

bpo-1635741: port sha3 module to multi-phase init #21855

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8a4b851
port sha3
koubaa Aug 10, 2020
1361dfd
blurb
koubaa Aug 13, 2020
f91e1ae
add comment
koubaa Aug 21, 2020
050d597
update based on feedback
koubaa Aug 26, 2020
338958d
update names
koubaa Aug 26, 2020
227c6c0
misc changes based on PR review
koubaa Aug 27, 2020
027bfe6
update based on PR
koubaa Aug 27, 2020
2b047e8
decref after del
koubaa Aug 29, 2020
054ebee
Update Modules/_sha3/sha3module.c
koubaa Aug 29, 2020
e1294af
fix typo
koubaa Sep 1, 2020
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
update based on feedback
  • Loading branch information
@koubaa
koubaa committed Aug 26, 2020
commit 050d597d859afaec6bc1f27760421eb29e5cbc4f
2 changes: 1 addition & 1 deletion Misc/NEWS.d/next/Core and Builtins/2020-08-13-07-19-21.bpo-1653741.fubBkb.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Port :mod:`sha3` to multi-phase init
Port :mod:`sha3` to multi-phase init. Convert static types to heap types.
83 changes: 41 additions & 42 deletions Modules/_sha3/sha3module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ typedef struct {
PyTypeObject *sha3_256_type;
PyTypeObject *sha3_384_type;
PyTypeObject *sha3_512_type;
PyTypeObject *shake128_type;
PyTypeObject *shake256_type;
PyTypeObject *shake_128_type;
PyTypeObject *shake_256_type;
#ifdef PY_WITH_KECCAK
PyTypeObject *keccak224_type;
PyTypeObject *keccak256_type;
PyTypeObject *keccak384_type;
PyTypeObject *keccak512_type;
PyTypeObject *keccak_224_type;
PyTypeObject *keccak_256_type;
PyTypeObject *keccak_384_type;
PyTypeObject *keccak_512_type;
#endif
} SHA3State;

Expand Down Expand Up @@ -211,18 +211,18 @@ py_sha3_new_impl(PyTypeObject *type, PyObject *data, int usedforsecurity)
} else if (type == state->sha3_512_type) {
res = Keccak_HashInitialize_SHA3_512(&self->hash_state);
#ifdef PY_WITH_KECCAK
} else if (type == state->keccak224_type) {
} else if (type == state->keccak_224_type) {
res = Keccak_HashInitialize(&self->hash_state, 1152, 448, 224, 0x01);
} else if (type == state->keccak256_type) {
} else if (type == state->keccak_256_type) {
res = Keccak_HashInitialize(&self->hash_state, 1088, 512, 256, 0x01);
} else if (type == state->keccak384_type) {
} else if (type == state->keccak_384_type) {
res = Keccak_HashInitialize(&self->hash_state, 832, 768, 384, 0x01);
} else if (type == state->keccak512_type) {
} else if (type == state->keccak_512_type) {
res = Keccak_HashInitialize(&self->hash_state, 576, 1024, 512, 0x01);
#endif
} else if (type == state->shake128_type) {
} else if (type == state->shake_128_type) {
res = Keccak_HashInitialize_SHAKE128(&self->hash_state);
} else if (type == state->shake256_type) {
} else if (type == state->shake_256_type) {
res = Keccak_HashInitialize_SHAKE256(&self->hash_state);
} else {
PyErr_BadInternalCall();
Expand Down Expand Up @@ -430,8 +430,6 @@ SHA3_get_name(SHA3object *self, void *closure)
SHA3State *state = PyType_GetModuleState(type);
assert(state != NULL);

//Should I use Py_IS_TYPE instead of == here?

if (type == state->sha3_224_type) {
return PyUnicode_FromString("sha3_224");
} else if (type == state->sha3_256_type) {
Expand All @@ -441,18 +439,18 @@ SHA3_get_name(SHA3object *self, void *closure)
} else if (type == state->sha3_512_type) {
return PyUnicode_FromString("sha3_512");
#ifdef PY_WITH_KECCAK
} else if (type == state->keccak224_type) {
} else if (type == state->keccak_224_type) {
return PyUnicode_FromString("keccak_224");
} else if (type == state->keccak256_type) {
} else if (type == state->keccak_256_type) {
return PyUnicode_FromString("keccak_256");
} else if (type == state->keccak384_type) {
} else if (type == state->keccak_384_type) {
return PyUnicode_FromString("keccak_384");
} else if (type == state->keccak512_type) {
} else if (type == state->keccak_512_type) {
return PyUnicode_FromString("keccak_512");
#endif
} else if (type == state->shake128_type) {
} else if (type == state->shake_128_type) {
return PyUnicode_FromString("shake_128");
} else if (type == state->shake256_type) {
} else if (type == state->shake_256_type) {
return PyUnicode_FromString("shake_256");
} else {
PyErr_BadInternalCall();
Expand Down Expand Up @@ -512,8 +510,8 @@ static PyGetSetDef SHA3_getseters[] = {
{0,0} \
}

// Using PyType_GetModuleState() on these types is safe since
// it cannot be subclassed: it does not have the Py_TPFLAGS_BASETYPE flag.
// Using PyType_GetModuleState() on these types is safe since they
// cannot be subclassed: it does not have the Py_TPFLAGS_BASETYPE flag.
#define SHA3_TYPE_SPEC(type_spec_obj, type_name, type_slots) \
static PyType_Spec type_spec_obj = { \
.name = type_name, \
Expand Down Expand Up @@ -565,17 +563,17 @@ Return a new Keccak hash object with a hashbit length of 64 bytes.");

#endif

SHA3_TYPE_SLOTS(SHA3_224slots, sha3_224__doc__, SHA3_methods);
SHA3_TYPE_SPEC(SHA3_224typespec, "_sha3.sha3_224", SHA3_224slots);
SHA3_TYPE_SLOTS(sha3_224slots, sha3_224__doc__, SHA3_methods);
SHA3_TYPE_SPEC(sha3_224typespec, "_sha3.sha3_224", sha3_224slots);

SHA3_TYPE_SLOTS(SHA3_256slots, sha3_256__doc__, SHA3_methods);
SHA3_TYPE_SPEC(SHA3_256typespec, "_sha3.sha3_256", SHA3_256slots);
SHA3_TYPE_SLOTS(sha3_256slots, sha3_256__doc__, SHA3_methods);
SHA3_TYPE_SPEC(sha3_256typespec, "_sha3.sha3_256", sha3_256slots);

SHA3_TYPE_SLOTS(SHA3_384slots, sha3_384__doc__, SHA3_methods);
SHA3_TYPE_SPEC(SHA3_384typespec, "_sha3.sha3_384", SHA3_384slots);
SHA3_TYPE_SLOTS(sha3_384slots, sha3_384__doc__, SHA3_methods);
SHA3_TYPE_SPEC(sha3_384typespec, "_sha3.sha3_384", sha3_384slots);

SHA3_TYPE_SLOTS(SHA3_512slots, sha3_512__doc__, SHA3_methods);
SHA3_TYPE_SPEC(SHA3_512typespec, "_sha3.sha3_512", SHA3_512slots);
SHA3_TYPE_SLOTS(sha3_512slots, sha3_512__doc__, SHA3_methods);
SHA3_TYPE_SPEC(sha3_512typespec, "_sha3.sha3_512", sha3_512slots);

#ifdef PY_WITH_KECCAK
SHA3_TYPE_SLOTS(Keccak_224slots, keccak_224__doc__, SHA3_methods);
Expand Down Expand Up @@ -699,10 +697,11 @@ SHA3_TYPE_SLOTS(SHAKE256slots, shake_256__doc__, SHAKE_methods);
SHA3_TYPE_SPEC(SHAKE256typespec, "_sha3.shake_256", SHAKE256slots);


static int sha3_exec(PyObject *m) {
static int
sha3_exec(PyObject *m) {
SHA3State *st = sha3_get_state(m);

#define init_sha3type(name, type, typespec) \
#define init_sha3type(type, typespec) \
do { \
st->type = (PyTypeObject *)PyType_FromModuleAndSpec( \
m, &typespec, NULL); \
Expand All @@ -714,18 +713,18 @@ static int sha3_exec(PyObject *m) {
} \
} while(0)

init_sha3type("sha3_224", sha3_224_type, SHA3_224typespec);
init_sha3type("sha3_256", sha3_256_type, SHA3_256typespec);
init_sha3type("sha3_384", sha3_384_type, SHA3_384typespec);
init_sha3type("sha3_512", sha3_512_type, SHA3_512typespec);
init_sha3type(sha3_224_type, sha3_224typespec);
init_sha3type(sha3_256_type, sha3_256typespec);
init_sha3type(sha3_384_type, sha3_384typespec);
init_sha3type(sha3_512_type, sha3_512typespec);
#ifdef PY_WITH_KECCAK
init_sha3type("keccak_224", keccak224_type, Keccak_224typespec);
init_sha3type("keccak_256", keccak256_type, Keccak_256typespec);
init_sha3type("keccak_384", keccak384_type, Keccak_384typespec);
init_sha3type("keccak_512", keccak512_type, Keccak_512typespec);
init_sha3type(keccak_224_type, Keccak_224typespec);
init_sha3type(keccak_256_type, Keccak_256typespec);
init_sha3type(keccak_384_type, Keccak_384typespec);
init_sha3type(keccak_512_type, Keccak_512typespec);
#endif
init_sha3type("shake_128", shake128_type, SHAKE128typespec);
init_sha3type("shake_256", shake256_type, SHAKE256typespec);
init_sha3type(shake_128_type, SHAKE128typespec);
init_sha3type(shake_256_type, SHAKE256typespec);
#undef init_sha3type

if (PyModule_AddIntConstant(m, "keccakopt", KeccakOpt) < 0) {
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy