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

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 PR
  • Loading branch information
@koubaa
koubaa committed Aug 27, 2020
commit 027bfe690579e0793d4948c16ccb15fef03c258d
33 changes: 16 additions & 17 deletions Modules/_sha3/sha3module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@ typedef struct {
PyTypeObject *sha3_256_type;
PyTypeObject *sha3_384_type;
PyTypeObject *sha3_512_type;
PyTypeObject *shake_128_type;
PyTypeObject *shake_256_type;
#ifdef PY_WITH_KECCAK
PyTypeObject *keccak_224_type;
PyTypeObject *keccak_256_type;
PyTypeObject *keccak_384_type;
PyTypeObject *keccak_512_type;
#endif
PyTypeObject *shake_128_type;
PyTypeObject *shake_256_type;
} SHA3State;

static inline SHA3State*
Expand Down Expand Up @@ -272,9 +272,8 @@ SHA3_dealloc(SHA3object *self)
if (self->lock) {
PyThread_free_lock(self->lock);
}
PyObject_Del(self);

Py_DECREF(Py_TYPE(self));
PyObject_Del(self);
}


Expand Down Expand Up @@ -516,7 +515,7 @@ static PyGetSetDef SHA3_getseters[] = {
// 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, \
.name = "_sha3." type_name, \
.basicsize = sizeof(SHA3object), \
.flags = Py_TPFLAGS_DEFAULT, \
.slots = type_slots \
Expand Down Expand Up @@ -566,29 +565,29 @@ Return a new Keccak hash object with a hashbit length of 64 bytes.");
#endif

SHA3_TYPE_SLOTS(sha3_224_slots, sha3_224__doc__, SHA3_methods);
SHA3_TYPE_SPEC(sha3_224_spec, "_sha3.sha3_224", sha3_224_slots);
SHA3_TYPE_SPEC(sha3_224_spec, "sha3_224", sha3_224_slots);

SHA3_TYPE_SLOTS(sha3_256_slots, sha3_256__doc__, SHA3_methods);
SHA3_TYPE_SPEC(sha3_256_spec, "_sha3.sha3_256", sha3_256_slots);
SHA3_TYPE_SPEC(sha3_256_spec, "sha3_256", sha3_256_slots);

SHA3_TYPE_SLOTS(sha3_384_slots, sha3_384__doc__, SHA3_methods);
SHA3_TYPE_SPEC(sha3_384_spec, "_sha3.sha3_384", sha3_384_slots);
SHA3_TYPE_SPEC(sha3_384_spec, "sha3_384", sha3_384_slots);

SHA3_TYPE_SLOTS(sha3_512_slots, sha3_512__doc__, SHA3_methods);
SHA3_TYPE_SPEC(sha3_512_spec, "_sha3.sha3_512", sha3_512_slots);
SHA3_TYPE_SPEC(sha3_512_spec, "sha3_512", sha3_512_slots);

#ifdef PY_WITH_KECCAK
SHA3_TYPE_SLOTS(Keccak_224_slots, keccak_224__doc__, SHA3_methods);
SHA3_TYPE_SPEC(Keccak_224_spec, "_sha3.keccak_224", Keccak_224_slots);
SHA3_TYPE_SPEC(Keccak_224_spec, "keccak_224", Keccak_224_slots);

SHA3_TYPE_SLOTS(Keccak_256_slots, keccak_256__doc__, SHA3_methods);
SHA3_TYPE_SPEC(Keccak_256_spec, "_sha3.keccak_256", Keccak_256_slots);
SHA3_TYPE_SPEC(Keccak_256_spec, "keccak_256", Keccak_256_slots);

SHA3_TYPE_SLOTS(Keccak_384_slots, keccak_384__doc__, SHA3_methods);
SHA3_TYPE_SPEC(Keccak_384_spec, "_sha3.keccak_384", Keccak_384_slots);
SHA3_TYPE_SPEC(Keccak_384_spec, "keccak_384", Keccak_384_slots);

SHA3_TYPE_SLOTS(Keccak_512_slots, keccak_512__doc__, SHA3_methods);
SHA3_TYPE_SPEC(Keccak_512_spec, "_sha3.keccak_512", Keccak_512_slots);
SHA3_TYPE_SPEC(Keccak_512_spec, "keccak_512", Keccak_512_slots);
#endif


Expand Down Expand Up @@ -693,10 +692,10 @@ PyDoc_STRVAR(shake_256__doc__,
Return a new SHAKE hash object.");

SHA3_TYPE_SLOTS(SHAKE128slots, shake_128__doc__, SHAKE_methods);
SHA3_TYPE_SPEC(SHAKE128_spec, "_sha3.shake_128", SHAKE128slots);
SHA3_TYPE_SPEC(SHAKE128_spec, "shake_128", SHAKE128slots);

SHA3_TYPE_SLOTS(SHAKE256slots, shake_256__doc__, SHAKE_methods);
SHA3_TYPE_SPEC(SHAKE256_spec, "_sha3.shake_256", SHAKE256slots);
SHA3_TYPE_SPEC(SHAKE256_spec, "shake_256", SHAKE256slots);


static int
Expand Down Expand Up @@ -744,7 +743,7 @@ _sha3_free(void *module)
}

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

Expand Down Expand Up @@ -786,7 +785,7 @@ sha3_exec(PyObject *m)
}

static PyModuleDef_Slot _sha3_slots[] = {
{Py_mod_exec, sha3_exec},
{Py_mod_exec, _sha3_exec},
{0, NULL}
};

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