post-merge

Author: picnixz

Modules/blake2module.c

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

Modules/hashlib.h

@@ -50,7 +50,8 @@
 
 #include "pythread.h"
 
-#define HASHLIB_LOCK_HEAD                                               \
+#define PyObject_HASHLIB_HEAD                                           \
+    PyObject_HEAD                                                       \
     /* Guard against race conditions during incremental update(). */    \
     PyMutex mutex;
 

Modules/hmacmodule.c

@@ -283,11 +283,7 @@ get_hmacmodule_state_by_cls(PyTypeObject *cls)
 typedef Hacl_Streaming_HMAC_agile_state HACL_HMAC_state;
 
 typedef struct HMACObject {
-    PyObject_HEAD
-
-    bool use_mutex;
-    PyMutex mutex;
-
+    PyObject_HASHLIB_HEAD
     // Hash function information
     PyObject *name;         // rendered name (exact unicode object)
     HMAC_Hash_Kind kind;    // can be used for runtime dispatch (must be known)
@@ -878,12 +874,11 @@ _hmac_HMAC_copy_impl(HMACObject *self, PyTypeObject *cls)
         return NULL;
     }
 
-    int rc = 0;
     HASHLIB_ACQUIRE_LOCK(self);
     /* copy hash information */
     hmac_copy_hinfo(copy, self);
     /* copy internal state */
-    rc = hmac_copy_state(copy, self);
+    int rc = hmac_copy_state(copy, self);
     HASHLIB_RELEASE_LOCK(self);
 
     if (rc < 0) {

Modules/md5module.c

@@ -37,10 +37,8 @@ class MD5Type "MD5object *" "&PyType_Type"
 
 #include "_hacl/Hacl_Hash_MD5.h"
 
-
 typedef struct {
-    PyObject_HEAD
-    HASHLIB_LOCK_HEAD
+    PyObject_HASHLIB_HEAD
     Hacl_Hash_MD5_state_t *hash_state;
 } MD5object;
 

Modules/sha1module.c

@@ -38,11 +38,7 @@ class SHA1Type "SHA1object *" "&PyType_Type"
 #include "_hacl/Hacl_Hash_SHA1.h"
 
 typedef struct {
-    PyObject_HEAD
-    // Prevents undefined behavior via multiple threads entering the C API.
-    bool use_mutex;
-    PyMutex mutex;
-    PyThread_type_lock lock;
+    PyObject_HASHLIB_HEAD
     Hacl_Hash_SHA1_state_t *hash_state;
 } SHA1object;
 

Modules/sha2module.c

@@ -50,20 +50,14 @@ class SHA512Type "SHA512object *" "&PyType_Type"
 // TODO: Get rid of int digestsize in favor of Hacl state info?
 
 typedef struct {
-    PyObject_HEAD
+    PyObject_HASHLIB_HEAD
     int digestsize;
-    // Prevents undefined behavior via multiple threads entering the C API.
-    bool use_mutex;
-    PyMutex mutex;
     Hacl_Hash_SHA2_state_t_256 *state;
 } SHA256object;
 
 typedef struct {
-    PyObject_HEAD
+    PyObject_HASHLIB_HEAD
     int digestsize;
-    // Prevents undefined behavior via multiple threads entering the C API.
-    bool use_mutex;
-    PyMutex mutex;
     Hacl_Hash_SHA2_state_t_512 *state;
 } SHA512object;
 

Modules/sha3module.c

@@ -59,10 +59,7 @@ class _sha3.shake_256 "SHA3object *" "&SHAKE256type"
 #include "_hacl/Hacl_Hash_SHA3.h"
 
 typedef struct {
-    PyObject_HEAD
-    // Prevents undefined behavior via multiple threads entering the C API.
-    bool use_mutex;
-    PyMutex mutex;
+    PyObject_HASHLIB_HEAD
     Hacl_Hash_SHA3_state_t *hash_state;
 } SHA3object;