try to keep includes as is

Author: picnixz

Modules/_hashopenssl.c

@@ -24,31 +24,27 @@
 
 #include "Python.h"
 #include "pycore_hashtable.h"
-#include "pycore_strhex.h"                  // _Py_strhex()
-#include "pycore_pyatomic_ft_wrappers.h"    // FT_ATOMIC_LOAD_PTR_RELAXED
+#include "pycore_strhex.h"               // _Py_strhex()
+#include "pycore_pyatomic_ft_wrappers.h" // FT_ATOMIC_LOAD_PTR_RELAXED
 #include "hashlib.h"
 
-#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-#  define Py_HAS_OPENSSL3_SUPPORT
-#endif
-
-#include <openssl/err.h>
 /* EVP is the preferred interface to hashing in OpenSSL */
 #include <openssl/evp.h>
-#include <openssl/crypto.h>                 // FIPS_mode()
+#include <openssl/crypto.h>              // FIPS_mode()
 /* We use the object interface to discover what hashes OpenSSL supports. */
 #include <openssl/objects.h>
+#include <openssl/err.h>
 
-#ifdef Py_HAS_OPENSSL3_SUPPORT
+#include <stdbool.h>
+
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+#  define Py_HAS_OPENSSL3_SUPPORT
 #  include <openssl/core_names.h>           // OSSL_MAC_PARAM_DIGEST
 #  include <openssl/params.h>               // OSSL_PARAM_*()
 #else
 #  include <openssl/hmac.h>                 // HMAC()
 #endif
 
-#include <stdbool.h>
-
 #ifndef OPENSSL_THREADS
 #  error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL"
 #endif
@@ -73,7 +69,7 @@
 
 #define PY_EVP_MD_CTX_md(CTX)   EVP_MD_CTX_get0_md(CTX)
 
-#define Py_HMAC_CTX_TYPE    EVP_MAC_CTX
+#define PY_HMAC_CTX_TYPE    EVP_MAC_CTX
 #define PY_HMAC_CTX_free    EVP_MAC_CTX_free
 #define PY_HMAC_update      EVP_MAC_update
 #else
@@ -84,7 +80,7 @@
 
 #define PY_EVP_MD_CTX_md(CTX)   EVP_MD_CTX_md(CTX)
 
-#define Py_HMAC_CTX_TYPE    HMAC_CTX
+#define PY_HMAC_CTX_TYPE    HMAC_CTX
 #define PY_HMAC_CTX_free    HMAC_CTX_free
 #define PY_HMAC_update      HMAC_Update
 #endif
@@ -1975,7 +1971,7 @@ hashlib_HMAC_get_hashlib_digest_name(HMACobject *self)
 }
 
 static int
-hashlib_openssl_HMAC_update_once(Py_HMAC_CTX_TYPE *ctx, const Py_buffer *v)
+hashlib_openssl_HMAC_update_once(PY_HMAC_CTX_TYPE *ctx, const Py_buffer *v)
 {
     if (!PY_HMAC_update(ctx, (const unsigned char *)v->buf, (size_t)v->len)) {
         notify_smart_ssl_error_occurred_in(Py_STRINGIFY(PY_HMAC_update));
@@ -1986,7 +1982,7 @@ hashlib_openssl_HMAC_update_once(Py_HMAC_CTX_TYPE *ctx, const Py_buffer *v)
 
 /* Thin wrapper around PY_HMAC_CTX_free that allows to pass a NULL 'ctx'. */
 static inline void
-hashlib_openssl_HMAC_CTX_free(Py_HMAC_CTX_TYPE *ctx)
+hashlib_openssl_HMAC_CTX_free(PY_HMAC_CTX_TYPE *ctx)
 {
     /* The NULL check was not present in every OpenSSL versions. */
     if (ctx) {
@@ -2008,10 +2004,10 @@ hashlib_openssl_HMAC_update_with_lock(HMACobject *self, PyObject *data)
     return r;
 }
 
-static Py_HMAC_CTX_TYPE *
+static PY_HMAC_CTX_TYPE *
 hashlib_openssl_HMAC_ctx_copy_with_lock(HMACobject *self)
 {
-    Py_HMAC_CTX_TYPE *ctx = NULL;
+    PY_HMAC_CTX_TYPE *ctx = NULL;
 #ifdef Py_HAS_OPENSSL3_SUPPORT
     HASHLIB_ACQUIRE_LOCK(self);
     ctx = EVP_MAC_CTX_dup(self->ctx);
@@ -2041,12 +2037,12 @@ hashlib_openssl_HMAC_ctx_copy_with_lock(HMACobject *self)
     return NULL;
 }
 
-static Py_HMAC_CTX_TYPE *
+static PY_HMAC_CTX_TYPE *
 hashlib_HMAC_CTX_new_from_digestmod(_hashlibstate *state,
                                     Py_buffer *key, PyObject *digestmod,
                                     int *nid)
 {
-    Py_HMAC_CTX_TYPE *ctx = NULL;
+    PY_HMAC_CTX_TYPE *ctx = NULL;
     PY_EVP_MD *md = NULL;
     int is_xof, r;
 #ifdef Py_HAS_OPENSSL3_SUPPORT
@@ -2149,7 +2145,7 @@ _hashlib_hmac_new_impl(PyObject *module, Py_buffer *key, PyObject *msg_obj,
 /*[clinic end generated code: output=c20d9e4d9ed6d219 input=5f4071dcc7f34362]*/
 {
     _hashlibstate *state = get_hashlib_state(module);
-    Py_HMAC_CTX_TYPE *ctx = NULL;
+    PY_HMAC_CTX_TYPE *ctx = NULL;
     HMACobject *self = NULL;
 #ifdef Py_HAS_OPENSSL3_SUPPORT
     int nid;
@@ -2216,7 +2212,7 @@ _hashlib_HMAC_copy_impl(HMACobject *self)
 /*[clinic end generated code: output=29aa28b452833127 input=e2fa6a05db61a4d6]*/
 {
     HMACobject *retval;
-    Py_HMAC_CTX_TYPE *ctx = hashlib_openssl_HMAC_ctx_copy_with_lock(self);
+    PY_HMAC_CTX_TYPE *ctx = hashlib_openssl_HMAC_ctx_copy_with_lock(self);
     if (ctx == NULL) {
         return NULL;
     }
@@ -2322,7 +2318,7 @@ hashlib_openssl_HMAC_digest_compute(HMACobject *self, unsigned char *buf)
         assert(PyErr_Occurred());
         return -1;
     }
-    Py_HMAC_CTX_TYPE *ctx = hashlib_openssl_HMAC_ctx_copy_with_lock(self);
+    PY_HMAC_CTX_TYPE *ctx = hashlib_openssl_HMAC_ctx_copy_with_lock(self);
     if (ctx == NULL) {
         return -1;
     }