traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sha3: let's keep it simple and always allocate enough extra space for uint64_t[20].

This commit is contained in:
Christian Heimes 2016-09-08 15:04:38 +02:00
parent c49a516ae9
commit c71ec8aef3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/_sha3/sha3module.c
View File

@ -114,7 +114,7 @@
#endif
#define SHA3_MAX_DIGESTSIZE 64 /* 64 Bytes (512 Bits) for 224 to 512 */
#define SHA3_LANESIZE 96 /* ExtractLane needs an extra 96 bytes */
#define SHA3_LANESIZE (20 * 8) /* ExtractLane needs max uint64_t[20] extra. */
#define SHA3_state Keccak_HashInstance
#define SHA3_init Keccak_HashInitialize
#define SHA3_process Keccak_HashUpdate
@ -605,8 +605,7 @@ _SHAKE_digest(SHA3object *self, unsigned long digestlen, int hex)
/* ExtractLane needs at least SHA3_MAX_DIGESTSIZE + SHA3_LANESIZE and
* SHA3_LANESIZE extra space.
*/
digest = (unsigned char*)PyMem_Malloc(SHA3_LANESIZE +
((digestlen > SHA3_MAX_DIGESTSIZE) ? digestlen : SHA3_MAX_DIGESTSIZE));
digest = (unsigned char*)PyMem_Malloc(digestlen + SHA3_LANESIZE);
if (digest == NULL) {
return PyErr_NoMemory();
}