use a macro for the mutex API

Author: picnixz

Modules/blake2module.c

@@ -353,6 +353,7 @@ type_to_impl(PyTypeObject *type)
 
 typedef struct {
     PyObject_HEAD
+    HASHLIB_MUTEX_API
     union {
         Hacl_Hash_Blake2s_state_t *blake2s_state;
         Hacl_Hash_Blake2b_state_t *blake2b_state;
@@ -364,8 +365,6 @@ typedef struct {
 #endif
     };
     blake2_impl impl;
-    bool use_mutex;
-    PyMutex mutex;
 } Blake2Object;
 
 #define _Blake2Object_CAST(op)  ((Blake2Object *)(op))

Modules/hashlib.h

@@ -2,6 +2,14 @@
 
 #include "pycore_lock.h"        // PyMutex
 
+#define HASHLIB_MUTEX_API                           \
+    /*
+     * Attributes to prevent undefined behaviors
+     * via multiple threads entering the C API.
+     */                                             \
+    bool use_mutex;                                 \
+    PyMutex mutex;
+
 /*
  * Given a PyObject* obj, fill in the Py_buffer* viewp with the result
  * of PyObject_GetBuffer.  Sets an exception and issues the erraction

Modules/hmacmodule.c

@@ -383,9 +383,7 @@ typedef Hacl_Streaming_HMAC_agile_state HACL_HMAC_state;
 
 typedef struct HMACObject {
     PyObject_HEAD
-
-    bool use_mutex;
-    PyMutex mutex;
+    HASHLIB_MUTEX_API
 
     // Hash function information
     PyObject *name;         // rendered name (exact unicode object)

Modules/md5module.c

@@ -39,9 +39,7 @@ class MD5Type "MD5object *" "&PyType_Type"
 
 typedef struct {
     PyObject_HEAD
-    // Prevents undefined behavior via multiple threads entering the C API.
-    bool use_mutex;
-    PyMutex mutex;
+    HASHLIB_MUTEX_API
     Hacl_Hash_MD5_state_t *hash_state;
 } MD5object;
 

Modules/sha1module.c

@@ -39,10 +39,7 @@ class SHA1Type "SHA1object *" "&PyType_Type"
 
 typedef struct {
     PyObject_HEAD
-    // Prevents undefined behavior via multiple threads entering the C API.
-    bool use_mutex;
-    PyMutex mutex;
-    PyThread_type_lock lock;
+    HASHLIB_MUTEX_API
     Hacl_Hash_SHA1_state_t *hash_state;
 } SHA1object;
 

Modules/sha2module.c

@@ -52,18 +52,14 @@ class SHA512Type "SHA512object *" "&PyType_Type"
 typedef struct {
     PyObject_HEAD
     int digestsize;
-    // Prevents undefined behavior via multiple threads entering the C API.
-    bool use_mutex;
-    PyMutex mutex;
+    HASHLIB_MUTEX_API
     Hacl_Hash_SHA2_state_t_256 *state;
 } SHA256object;
 
 typedef struct {
     PyObject_HEAD
     int digestsize;
-    // Prevents undefined behavior via multiple threads entering the C API.
-    bool use_mutex;
-    PyMutex mutex;
+    HASHLIB_MUTEX_API
     Hacl_Hash_SHA2_state_t_512 *state;
 } SHA512object;
 

Modules/sha3module.c

@@ -60,9 +60,7 @@ class _sha3.shake_256 "SHA3object *" "&SHAKE256type"
 
 typedef struct {
     PyObject_HEAD
-    // Prevents undefined behavior via multiple threads entering the C API.
-    bool use_mutex;
-    PyMutex mutex;
+    HASHLIB_MUTEX_API
     Hacl_Hash_SHA3_state_t *hash_state;
 } SHA3object;