defer cosmetics

Author: picnixz

Modules/hashlib.h

@@ -3,9 +3,9 @@
 #include "pycore_lock.h"        // PyMutex
 
 /*
- * Given a PyObject* 'obj', fill in the Py_buffer* 'viewp' with the result
- * of PyObject_GetBuffer.  Sets an exception and issues the 'erraction'
- * on any errors, e.g., 'return NULL' or 'goto error'.
+ * Given a PyObject* obj, fill in the Py_buffer* viewp with the result
+ * of PyObject_GetBuffer.  Sets an exception and issues the erraction
+ * on any errors, e.g. 'return NULL' or 'goto error'.
  */
 #define GET_BUFFER_VIEW_OR_ERROR(obj, viewp, erraction) do { \
         if (PyUnicode_Check((obj))) { \

Modules/hmacmodule.c

@@ -500,11 +500,11 @@ _hacl_hmac_state_update(HACL_HMAC_state *state, uint8_t *buf, Py_ssize_t len)
 
 /* Static information used to construct the hash table. */
 static const py_hmac_hinfo py_hmac_static_hinfo[] = {
-#define Py_HMAC_HINFO_HACL_API(HACL_HID)                    \
-    {                                                       \
-        /* one-shot helpers */                              \
-        .compute = &Py_hmac_## HACL_HID ##_compute_func,    \
-        .compute_py = &_hmac_compute_## HACL_HID ##_impl,   \
+#define Py_HMAC_HINFO_HACL_API(HACL_HID)                                \
+    {                                                                   \
+        /* one-shot helpers */                                          \
+        .compute = &Py_hmac_## HACL_HID ##_compute_func,                \
+        .compute_py = &_hmac_compute_## HACL_HID ##_impl,               \
     }
 
 #define Py_HMAC_HINFO_ENTRY(HACL_HID, HLIB_NAME)            \

Modules/md5module.c

@@ -159,15 +159,14 @@ MD5Type_hexdigest_impl(MD5object *self)
 }
 
 static void
-_hacl_md5_state_update(Hacl_Hash_MD5_state_t *state,
-                       uint8_t *buf, Py_ssize_t len)
+update(Hacl_Hash_MD5_state_t *state, uint8_t *buf, Py_ssize_t len)
 {
-    assert(len >= 0);
     /*
-     * Note: we explicitly ignore the error code on the basis that it would
-     * take more than 1 billion years to overflow the maximum admissible length
-     * for MD5 (2^61 - 1).
-     */
+    * Note: we explicitly ignore the error code on the basis that it would
+    * take more than 1 billion years to overflow the maximum admissible length
+    * for MD5 (2^61 - 1).
+    */
+    assert(len >= 0);
 #if PY_SSIZE_T_MAX > UINT32_MAX
     while (len > UINT32_MAX) {
         (void)Hacl_Hash_MD5_update(state, buf, UINT32_MAX);
@@ -196,7 +195,7 @@ MD5Type_update_impl(MD5object *self, PyObject *obj)
     GET_BUFFER_VIEW_OR_ERROUT(obj, &buf);
     HASHLIB_EXTERNAL_INSTRUCTIONS_LOCKED(
         self, buf.len,
-        _hacl_md5_state_update(self->hash_state, buf.buf, buf.len)
+        update(self->hash_state, buf.buf, buf.len)
     );
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;
@@ -303,7 +302,7 @@ _md5_md5_impl(PyObject *module, PyObject *data, int usedforsecurity,
          * where it is not yet possible to have concurrent access. */
         HASHLIB_EXTERNAL_INSTRUCTIONS_UNLOCKED(
             buf.len,
-            _hacl_md5_state_update(new->hash_state, buf.buf, buf.len)
+            update(new->hash_state, buf.buf, buf.len)
         );
         PyBuffer_Release(&buf);
     }

Modules/sha1module.c

@@ -162,8 +162,7 @@ SHA1Type_hexdigest_impl(SHA1object *self)
 }
 
 static void
-_hacl_sha1_state_update(Hacl_Hash_SHA1_state_t *state,
-                        uint8_t *buf, Py_ssize_t len)
+update(Hacl_Hash_SHA1_state_t *state, uint8_t *buf, Py_ssize_t len)
 {
     /*
      * Note: we explicitly ignore the error code on the basis that it would
@@ -198,7 +197,7 @@ SHA1Type_update_impl(SHA1object *self, PyObject *obj)
     GET_BUFFER_VIEW_OR_ERROUT(obj, &buf);
     HASHLIB_EXTERNAL_INSTRUCTIONS_LOCKED(
         self, buf.len,
-        _hacl_sha1_state_update(self->hash_state, buf.buf, buf.len)
+        update(self->hash_state, buf.buf, buf.len)
     );
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;
@@ -304,7 +303,7 @@ _sha1_sha1_impl(PyObject *module, PyObject *data, int usedforsecurity,
          * where it is not yet possible to have concurrent access. */
         HASHLIB_EXTERNAL_INSTRUCTIONS_UNLOCKED(
             buf.len,
-            _hacl_sha1_state_update(new->hash_state, buf.buf, buf.len)
+            update(new->hash_state, buf.buf, buf.len)
         );
         PyBuffer_Release(&buf);
     }

Modules/sha2module.c

@@ -200,8 +200,7 @@ SHA512_dealloc(PyObject *op)
  * 64 bits so we loop in <4gig chunks when needed. */
 
 static void
-_hacl_sha2_state_update_256(Hacl_Hash_SHA2_state_t_256 *state,
-                            uint8_t *buf, Py_ssize_t len)
+update_256(Hacl_Hash_SHA2_state_t_256 *state, uint8_t *buf, Py_ssize_t len)
 {
     /*
      * Note: we explicitly ignore the error code on the basis that it would
@@ -220,8 +219,7 @@ _hacl_sha2_state_update_256(Hacl_Hash_SHA2_state_t_256 *state,
 }
 
 static void
-_hacl_sha2_state_update_512(Hacl_Hash_SHA2_state_t_512 *state,
-                            uint8_t *buf, Py_ssize_t len)
+update_512(Hacl_Hash_SHA2_state_t_512 *state, uint8_t *buf, Py_ssize_t len)
 {
     /*
      * Note: we explicitly ignore the error code on the basis that it would
@@ -408,7 +406,7 @@ SHA256Type_update_impl(SHA256object *self, PyObject *obj)
     GET_BUFFER_VIEW_OR_ERROUT(obj, &buf);
     HASHLIB_EXTERNAL_INSTRUCTIONS_LOCKED(
         self, buf.len,
-        _hacl_sha2_state_update_256(self->state, buf.buf, buf.len)
+        update_256(self->state, buf.buf, buf.len)
     );
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;
@@ -431,7 +429,7 @@ SHA512Type_update_impl(SHA512object *self, PyObject *obj)
     GET_BUFFER_VIEW_OR_ERROUT(obj, &buf);
     HASHLIB_EXTERNAL_INSTRUCTIONS_LOCKED(
         self, buf.len,
-        _hacl_sha2_state_update_512(self->state, buf.buf, buf.len)
+        update_512(self->state, buf.buf, buf.len)
     );
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;
@@ -616,7 +614,7 @@ _sha2_sha256_impl(PyObject *module, PyObject *data, int usedforsecurity,
          * where it is not yet possible to have concurrent access. */
         HASHLIB_EXTERNAL_INSTRUCTIONS_UNLOCKED(
             buf.len,
-            _hacl_sha2_state_update_256(new->state, buf.buf, buf.len)
+            update_256(new->state, buf.buf, buf.len)
         );
         PyBuffer_Release(&buf);
     }
@@ -674,7 +672,7 @@ _sha2_sha224_impl(PyObject *module, PyObject *data, int usedforsecurity,
          * where it is not yet possible to have concurrent access. */
         HASHLIB_EXTERNAL_INSTRUCTIONS_UNLOCKED(
             buf.len,
-            _hacl_sha2_state_update_256(new->state, buf.buf, buf.len)
+            update_256(new->state, buf.buf, buf.len)
         );
         PyBuffer_Release(&buf);
     }
@@ -733,7 +731,7 @@ _sha2_sha512_impl(PyObject *module, PyObject *data, int usedforsecurity,
          * where it is not yet possible to have concurrent access. */
         HASHLIB_EXTERNAL_INSTRUCTIONS_UNLOCKED(
             buf.len,
-            _hacl_sha2_state_update_512(new->state, buf.buf, buf.len)
+            update_512(new->state, buf.buf, buf.len)
         );
         PyBuffer_Release(&buf);
     }
@@ -792,7 +790,7 @@ _sha2_sha384_impl(PyObject *module, PyObject *data, int usedforsecurity,
          * where it is not yet possible to have concurrent access. */
         HASHLIB_EXTERNAL_INSTRUCTIONS_UNLOCKED(
             buf.len,
-            _hacl_sha2_state_update_512(new->state, buf.buf, buf.len)
+            update_512(new->state, buf.buf, buf.len)
         );
         PyBuffer_Release(&buf);
     }

Modules/sha3module.c

@@ -92,8 +92,7 @@ newSHA3object(PyTypeObject *type)
 }
 
 static void
-_hacl_sha3_state_update(Hacl_Hash_SHA3_state_t *state,
-                        uint8_t *buf, Py_ssize_t len)
+sha3_update(Hacl_Hash_SHA3_state_t *state, uint8_t *buf, Py_ssize_t len)
 {
   /*
    * Note: we explicitly ignore the error code on the basis that it would
@@ -176,7 +175,7 @@ py_sha3_new_impl(PyTypeObject *type, PyObject *data_obj, int usedforsecurity,
          * where it is not yet possible to have concurrent access. */
         HASHLIB_EXTERNAL_INSTRUCTIONS_UNLOCKED(
             buf.len,
-            _hacl_sha3_state_update(self->hash_state, buf.buf, buf.len)
+            sha3_update(self->hash_state, buf.buf, buf.len)
         );
     }
 
@@ -311,7 +310,7 @@ _sha3_sha3_224_update_impl(SHA3object *self, PyObject *data)
     GET_BUFFER_VIEW_OR_ERROUT(data, &buf);
     HASHLIB_EXTERNAL_INSTRUCTIONS_LOCKED(
         self, buf.len,
-        _hacl_sha3_state_update(self->hash_state, buf.buf, buf.len)
+        sha3_update(self->hash_state, buf.buf, buf.len)
     );
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;