diff options
| author | Christian Heimes <christian@cheimes.de> | 2012-10-14 22:16:27 +0200 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2012-10-14 22:16:27 +0200 |
| commit | 7707f6fd328ebdad65671323aaed294d5a0fe1db (patch) | |
| tree | 03faa9eef235eb30d344c3f04cced065ecf6aaf2 | |
| parent | 11dc6c311dc9f8b01fa6a27e1bcdee4c4394d7a2 (diff) | |
| download | cpython-git-7707f6fd328ebdad65671323aaed294d5a0fe1db.tar.gz | |
Issue #16234: Modify sha3's block_size method to return NotImplemented.
This makes the sha3 types unusable from the hmac module. HMAC-SHA3 hasn't been specified yet.
| -rw-r--r-- | Modules/_sha3/sha3module.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c index bde474f8f8..08f683934b 100644 --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -140,7 +140,7 @@ #include "keccak/KeccakF-1600-opt32.c" #endif -#define SHA3_BLOCKSIZE 200 /* 1600 bits */ +/* #define SHA3_BLOCKSIZE 200 // 1600 bits */ #define SHA3_MAX_DIGESTSIZE 64 /* 512 bits */ #define SHA3_state hashState #define SHA3_init Init @@ -367,7 +367,11 @@ static PyMethodDef SHA3_methods[] = { static PyObject * SHA3_get_block_size(SHA3object *self, void *closure) { - return PyLong_FromLong(SHA3_BLOCKSIZE); + /* HMAC-SHA3 hasn't been specified yet and no official test vectors are + * available. Thus block_size returns NotImplemented to prevent people + * from using SHA3 with the hmac module. + */ + Py_RETURN_NOTIMPLEMENTED; } static PyObject * |