do not guard against empty buffers for now

picnixz · picnixz · commit bb237c2c7dd5 · 2025-06-16T12:33:23.000+02:00
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
@@ -800,16 +800,16 @@ static PyObject *
 _hashlib_HASH_update_impl(HASHobject *self, PyObject *obj)
 /*[clinic end generated code: output=62ad989754946b86 input=aa1ce20e3f92ceb6]*/
 {
-    int rc;
+    int result;
     Py_buffer view;
     GET_BUFFER_VIEW_OR_ERROUT(obj, &view);
     Py_BEGIN_ALLOW_THREADS
         HASHLIB_ACQUIRE_LOCK(self);
-        rc = _hashlib_HASH_hash(self, view.buf, view.len);
+        result = _hashlib_HASH_hash(self, view.buf, view.len);
         HASHLIB_RELEASE_LOCK(self);
     Py_END_ALLOW_THREADS
     PyBuffer_Release(&view);
-    return rc < 0 ? NULL : Py_None;
+    return result < 0 ? NULL : Py_None;
 }
 
 static PyMethodDef HASH_methods[] = {
@@ -1806,19 +1806,17 @@ _hashlib_hmac_digest_size(HMACobject *self)
 static int
 _hmac_update(HMACobject *self, PyObject *obj)
 {
-    int r = 1;
+    int r;
     Py_buffer view = {0};
 
     GET_BUFFER_VIEW_OR_ERROR(obj, &view, return 0);
-    if (view.len > 0) {
-        Py_BEGIN_ALLOW_THREADS
-            HASHLIB_ACQUIRE_LOCK(self);
-            r = HMAC_Update(self->ctx,
-                            (const unsigned char *)view.buf,
-                            (size_t)view.len);
-            HASHLIB_RELEASE_LOCK(self);
-        Py_END_ALLOW_THREADS
-    }
+    Py_BEGIN_ALLOW_THREADS
+        HASHLIB_ACQUIRE_LOCK(self);
+        r = HMAC_Update(self->ctx,
+                        (const unsigned char *)view.buf,
+                        (size_t)view.len);
+        HASHLIB_RELEASE_LOCK(self);
+    Py_END_ALLOW_THREADS
     PyBuffer_Release(&view);
 
     if (r == 0) {
diff --git a/Modules/blake2module.c b/Modules/blake2module.c
@@ -642,11 +642,9 @@ py_blake2_new(PyTypeObject *type, PyObject *data, int digest_size,
     if (data != NULL) {
         Py_buffer buf;
         GET_BUFFER_VIEW_OR_ERROR(data, &buf, goto error);
-        if (buf.len > 0) {
-            Py_BEGIN_ALLOW_THREADS
-                blake2_update_state_unlocked(self, buf.buf, buf.len);
-            Py_END_ALLOW_THREADS
-        }
+        Py_BEGIN_ALLOW_THREADS
+            blake2_update_state_unlocked(self, buf.buf, buf.len);
+        Py_END_ALLOW_THREADS
         PyBuffer_Release(&buf);
     }
 
@@ -819,13 +817,11 @@ _blake2_blake2b_update_impl(Blake2Object *self, PyObject *data)
 {
     Py_buffer buf;
     GET_BUFFER_VIEW_OR_ERROUT(data, &buf);
-    if (buf.len > 0) {
-        Py_BEGIN_ALLOW_THREADS
-            HASHLIB_ACQUIRE_LOCK(self);
-            blake2_update_state_unlocked(self, buf.buf, buf.len);
-            HASHLIB_RELEASE_LOCK(self);
-        Py_END_ALLOW_THREADS
-    }
+    Py_BEGIN_ALLOW_THREADS
+        HASHLIB_ACQUIRE_LOCK(self);
+        blake2_update_state_unlocked(self, buf.buf, buf.len);
+        HASHLIB_RELEASE_LOCK(self);
+    Py_END_ALLOW_THREADS
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;
 }
diff --git a/Modules/hmacmodule.c b/Modules/hmacmodule.c
@@ -906,13 +906,11 @@ _hmac_HMAC_update_impl(HMACObject *self, PyObject *msgobj)
     int rc = 0;
     Py_buffer msg;
     GET_BUFFER_VIEW_OR_ERROUT(msgobj, &msg);
-    if (msg.len > 0) {
-        Py_BEGIN_ALLOW_THREADS
-            HASHLIB_ACQUIRE_LOCK(self);
-            rc = _hacl_hmac_state_update(self->state, msg.buf, msg.len);
-            HASHLIB_RELEASE_LOCK(self);
-        Py_END_ALLOW_THREADS
-    }
+    Py_BEGIN_ALLOW_THREADS
+        HASHLIB_ACQUIRE_LOCK(self);
+        rc = _hacl_hmac_state_update(self->state, msg.buf, msg.len);
+        HASHLIB_RELEASE_LOCK(self);
+    Py_END_ALLOW_THREADS
     PyBuffer_Release(&msg);
     return rc < 0 ? NULL : Py_None;
 }
diff --git a/Modules/md5module.c b/Modules/md5module.c
@@ -123,14 +123,6 @@ MD5Type_copy_impl(MD5object *self, PyTypeObject *cls)
     return (PyObject *)newobj;
 }
 
-static void
-md5_digest_compute_with_lock(MD5object *self, uint8_t *digest)
-{
-    HASHLIB_ACQUIRE_LOCK(self);
-    Hacl_Hash_MD5_digest(self->hash_state, digest);
-    HASHLIB_RELEASE_LOCK(self);
-}
-
 /*[clinic input]
 MD5Type.digest
 
@@ -142,7 +134,9 @@ MD5Type_digest_impl(MD5object *self)
 /*[clinic end generated code: output=eb691dc4190a07ec input=bc0c4397c2994be6]*/
 {
     uint8_t digest[MD5_DIGESTSIZE];
-    md5_digest_compute_with_lock(self, digest);
+    HASHLIB_ACQUIRE_LOCK(self);
+    Hacl_Hash_MD5_digest(self->hash_state, digest);
+    HASHLIB_RELEASE_LOCK(self);
     return PyBytes_FromStringAndSize((const char *)digest, MD5_DIGESTSIZE);
 }
 
@@ -157,7 +151,9 @@ MD5Type_hexdigest_impl(MD5object *self)
 /*[clinic end generated code: output=17badced1f3ac932 input=b60b19de644798dd]*/
 {
     uint8_t digest[MD5_DIGESTSIZE];
-    md5_digest_compute_with_lock(self, digest);
+    HASHLIB_ACQUIRE_LOCK(self);
+    Hacl_Hash_MD5_digest(self->hash_state, digest);
+    HASHLIB_RELEASE_LOCK(self);
     return _Py_strhex((const char *)digest, MD5_DIGESTSIZE);
 }
 
@@ -197,13 +193,11 @@ MD5Type_update_impl(MD5object *self, PyObject *obj)
 {
     Py_buffer buf;
     GET_BUFFER_VIEW_OR_ERROUT(obj, &buf);
-    if (buf.len > 0) {
-        Py_BEGIN_ALLOW_THREADS
-            HASHLIB_ACQUIRE_LOCK(self);
-            _hacl_md5_state_update(self->hash_state, buf.buf, buf.len);
-            HASHLIB_RELEASE_LOCK(self);
-        Py_END_ALLOW_THREADS
-    }
+    Py_BEGIN_ALLOW_THREADS
+        HASHLIB_ACQUIRE_LOCK(self);
+        _hacl_md5_state_update(self->hash_state, buf.buf, buf.len);
+        HASHLIB_RELEASE_LOCK(self);
+    Py_END_ALLOW_THREADS
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;
 }
diff --git a/Modules/sha1module.c b/Modules/sha1module.c
@@ -196,13 +196,11 @@ SHA1Type_update_impl(SHA1object *self, PyObject *obj)
 {
     Py_buffer buf;
     GET_BUFFER_VIEW_OR_ERROUT(obj, &buf);
-    if (buf.len > 0) {
-        Py_BEGIN_ALLOW_THREADS
-            HASHLIB_ACQUIRE_LOCK(self);
-            _hacl_sha1_state_update(self->hash_state, buf.buf, buf.len);
-            HASHLIB_RELEASE_LOCK(self);
-        Py_END_ALLOW_THREADS
-    }
+    Py_BEGIN_ALLOW_THREADS
+        HASHLIB_ACQUIRE_LOCK(self);
+        _hacl_sha1_state_update(self->hash_state, buf.buf, buf.len);
+        HASHLIB_RELEASE_LOCK(self);
+    Py_END_ALLOW_THREADS
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;
 }
diff --git a/Modules/sha2module.c b/Modules/sha2module.c
@@ -406,13 +406,11 @@ SHA256Type_update_impl(SHA256object *self, PyObject *obj)
 {
     Py_buffer buf;
     GET_BUFFER_VIEW_OR_ERROUT(obj, &buf);
-    if (buf.len > 0) {
-        Py_BEGIN_ALLOW_THREADS
-            HASHLIB_ACQUIRE_LOCK(self);
-            _hacl_sha2_state_update_256(self->state, buf.buf, buf.len);
-            HASHLIB_RELEASE_LOCK(self);
-        Py_END_ALLOW_THREADS
-    }
+    Py_BEGIN_ALLOW_THREADS
+        HASHLIB_ACQUIRE_LOCK(self);
+        _hacl_sha2_state_update_256(self->state, buf.buf, buf.len);
+        HASHLIB_RELEASE_LOCK(self);
+    Py_END_ALLOW_THREADS
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;
 }
@@ -432,13 +430,11 @@ SHA512Type_update_impl(SHA512object *self, PyObject *obj)
 {
     Py_buffer buf;
     GET_BUFFER_VIEW_OR_ERROUT(obj, &buf);
-    if (buf.len > 0) {
-        Py_BEGIN_ALLOW_THREADS
-            HASHLIB_ACQUIRE_LOCK(self);
-            _hacl_sha2_state_update_512(self->state, buf.buf, buf.len);
-            HASHLIB_RELEASE_LOCK(self);
-        Py_END_ALLOW_THREADS
-    }
+    Py_BEGIN_ALLOW_THREADS
+        HASHLIB_ACQUIRE_LOCK(self);
+        _hacl_sha2_state_update_512(self->state, buf.buf, buf.len);
+        HASHLIB_RELEASE_LOCK(self);
+    Py_END_ALLOW_THREADS
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;
 }
@@ -793,11 +789,9 @@ _sha2_sha384_impl(PyObject *module, PyObject *data, int usedforsecurity,
     if (string) {
         /* Do not use self->mutex here as this is the constructor
          * where it is not yet possible to have concurrent access. */
-        if (buf.len > 0) {
-            Py_BEGIN_ALLOW_THREADS
-                _hacl_sha2_state_update_512(new->state, buf.buf, buf.len);
-            Py_END_ALLOW_THREADS
-        }
+        Py_BEGIN_ALLOW_THREADS
+            _hacl_sha2_state_update_512(new->state, buf.buf, buf.len);
+        Py_END_ALLOW_THREADS
         PyBuffer_Release(&buf);
     }
 
diff --git a/Modules/sha3module.c b/Modules/sha3module.c
@@ -162,11 +162,9 @@ py_sha3_new_impl(PyTypeObject *type, PyObject *data_obj, int usedforsecurity,
         GET_BUFFER_VIEW_OR_ERROR(data, &buf, goto error);
         /* Do not use self->mutex here as this is the constructor
          * where it is not yet possible to have concurrent access. */
-        if (buf.len > 0) {
-            Py_BEGIN_ALLOW_THREADS
-                sha3_update(self->hash_state, buf.buf, buf.len);
-            Py_END_ALLOW_THREADS
-        }
+        Py_BEGIN_ALLOW_THREADS
+            sha3_update(self->hash_state, buf.buf, buf.len);
+        Py_END_ALLOW_THREADS
     }
 
     PyBuffer_Release(&buf);
@@ -298,13 +296,11 @@ _sha3_sha3_224_update_impl(SHA3object *self, PyObject *data)
 {
     Py_buffer buf;
     GET_BUFFER_VIEW_OR_ERROUT(data, &buf);
-    if (buf.len > 0) {
-        Py_BEGIN_ALLOW_THREADS
-            HASHLIB_ACQUIRE_LOCK(self);
-            sha3_update(self->hash_state, buf.buf, buf.len);
-            HASHLIB_RELEASE_LOCK(self);
-        Py_END_ALLOW_THREADS
-    }
+    Py_BEGIN_ALLOW_THREADS
+        HASHLIB_ACQUIRE_LOCK(self);
+        sha3_update(self->hash_state, buf.buf, buf.len);
+        HASHLIB_RELEASE_LOCK(self);
+    Py_END_ALLOW_THREADS
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;
 }
