vendor/openssl/3.0.19

36 files changed, 1126 insertions, 1136 deletions

diff --git a/include/internal/asn1.h b/include/internal/asn1.h
index 3143e3405f1d..02532d042424 100644
--- a/include/internal/asn1.h
+++ b/include/internal/asn1.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_INTERNAL_ASN1_H
-# define OSSL_INTERNAL_ASN1_H
-# pragma once
+#define OSSL_INTERNAL_ASN1_H
+#pragma once
 
 int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb);
 
diff --git a/include/internal/bio.h b/include/internal/bio.h
index 547a73d02d4e..fd61bb94b86a 100644
--- a/include/internal/bio.h
+++ b/include/internal/bio.h
@@ -8,39 +8,38 @@
  */
 
 #ifndef OSSL_INTERNAL_BIO_H
-# define OSSL_INTERNAL_BIO_H
-# pragma once
+#define OSSL_INTERNAL_BIO_H
+#pragma once
 
-# include <openssl/core.h>
-# include <openssl/bio.h>
+#include <openssl/core.h>
+#include <openssl/bio.h>
 
 struct bio_method_st {
     int type;
     char *name;
-    int (*bwrite) (BIO *, const char *, size_t, size_t *);
-    int (*bwrite_old) (BIO *, const char *, int);
-    int (*bread) (BIO *, char *, size_t, size_t *);
-    int (*bread_old) (BIO *, char *, int);
-    int (*bputs) (BIO *, const char *);
-    int (*bgets) (BIO *, char *, int);
-    long (*ctrl) (BIO *, int, long, void *);
-    int (*create) (BIO *);
-    int (*destroy) (BIO *);
-    long (*callback_ctrl) (BIO *, int, BIO_info_cb *);
+    int (*bwrite)(BIO *, const char *, size_t, size_t *);
+    int (*bwrite_old)(BIO *, const char *, int);
+    int (*bread)(BIO *, char *, size_t, size_t *);
+    int (*bread_old)(BIO *, char *, int);
+    int (*bputs)(BIO *, const char *);
+    int (*bgets)(BIO *, char *, int);
+    long (*ctrl)(BIO *, int, long, void *);
+    int (*create)(BIO *);
+    int (*destroy)(BIO *);
+    long (*callback_ctrl)(BIO *, int, BIO_info_cb *);
 };
 
 void bio_free_ex_data(BIO *bio);
 void bio_cleanup(void);
 
-
 /* Old style to new style BIO_METHOD conversion functions */
 int bwrite_conv(BIO *bio, const char *data, size_t datal, size_t *written);
 int bread_conv(BIO *bio, char *data, size_t datal, size_t *read);
 
 /* Changes to these internal BIOs must also update include/openssl/bio.h */
-# define BIO_CTRL_SET_KTLS                      72
-# define BIO_CTRL_SET_KTLS_TX_SEND_CTRL_MSG     74
-# define BIO_CTRL_CLEAR_KTLS_TX_CTRL_MSG        75
+#define BIO_CTRL_SET_KTLS 72
+#define BIO_CTRL_SET_KTLS_TX_SEND_CTRL_MSG 74
+#define BIO_CTRL_CLEAR_KTLS_TX_CTRL_MSG 75
 
 /*
  * This is used with socket BIOs:
@@ -48,37 +47,37 @@ int bread_conv(BIO *bio, char *data, size_t datal, size_t *read);
  * BIO_FLAGS_KTLS_TX_CTRL_MSG means we are about to send a ctrl message next.
  * BIO_FLAGS_KTLS_RX means we are using ktls with this BIO for receiving.
  */
-# define BIO_FLAGS_KTLS_TX_CTRL_MSG 0x1000
-# define BIO_FLAGS_KTLS_RX          0x2000
-# define BIO_FLAGS_KTLS_TX          0x4000
+#define BIO_FLAGS_KTLS_TX_CTRL_MSG 0x1000
+#define BIO_FLAGS_KTLS_RX 0x2000
+#define BIO_FLAGS_KTLS_TX 0x4000
 
 /* KTLS related controls and flags */
-# define BIO_set_ktls_flag(b, is_tx) \
+#define BIO_set_ktls_flag(b, is_tx) \
     BIO_set_flags(b, (is_tx) ? BIO_FLAGS_KTLS_TX : BIO_FLAGS_KTLS_RX)
-# define BIO_should_ktls_flag(b, is_tx) \
+#define BIO_should_ktls_flag(b, is_tx) \
     BIO_test_flags(b, (is_tx) ? BIO_FLAGS_KTLS_TX : BIO_FLAGS_KTLS_RX)
-# define BIO_set_ktls_ctrl_msg_flag(b) \
+#define BIO_set_ktls_ctrl_msg_flag(b) \
     BIO_set_flags(b, BIO_FLAGS_KTLS_TX_CTRL_MSG)
-# define BIO_should_ktls_ctrl_msg_flag(b) \
+#define BIO_should_ktls_ctrl_msg_flag(b) \
     BIO_test_flags(b, BIO_FLAGS_KTLS_TX_CTRL_MSG)
-# define BIO_clear_ktls_ctrl_msg_flag(b) \
+#define BIO_clear_ktls_ctrl_msg_flag(b) \
     BIO_clear_flags(b, BIO_FLAGS_KTLS_TX_CTRL_MSG)
 
-# define BIO_set_ktls(b, keyblob, is_tx)   \
-     BIO_ctrl(b, BIO_CTRL_SET_KTLS, is_tx, keyblob)
-# define BIO_set_ktls_ctrl_msg(b, record_type)   \
-     BIO_ctrl(b, BIO_CTRL_SET_KTLS_TX_SEND_CTRL_MSG, record_type, NULL)
-# define BIO_clear_ktls_ctrl_msg(b) \
-     BIO_ctrl(b, BIO_CTRL_CLEAR_KTLS_TX_CTRL_MSG, 0, NULL)
+#define BIO_set_ktls(b, keyblob, is_tx) \
+    BIO_ctrl(b, BIO_CTRL_SET_KTLS, is_tx, keyblob)
+#define BIO_set_ktls_ctrl_msg(b, record_type) \
+    BIO_ctrl(b, BIO_CTRL_SET_KTLS_TX_SEND_CTRL_MSG, record_type, NULL)
+#define BIO_clear_ktls_ctrl_msg(b) \
+    BIO_ctrl(b, BIO_CTRL_CLEAR_KTLS_TX_CTRL_MSG, 0, NULL)
 
 /* Functions to allow the core to offer the CORE_BIO type to providers */
 OSSL_CORE_BIO *ossl_core_bio_new_from_bio(BIO *bio);
 OSSL_CORE_BIO *ossl_core_bio_new_file(const char *filename, const char *mode);
 OSSL_CORE_BIO *ossl_core_bio_new_mem_buf(const void *buf, int len);
 int ossl_core_bio_read_ex(OSSL_CORE_BIO *cb, void *data, size_t dlen,
-                          size_t *readbytes);
+    size_t *readbytes);
 int ossl_core_bio_write_ex(OSSL_CORE_BIO *cb, const void *data, size_t dlen,
-                           size_t *written);
+    size_t *written);
 int ossl_core_bio_gets(OSSL_CORE_BIO *cb, char *buf, int size);
 int ossl_core_bio_puts(OSSL_CORE_BIO *cb, const char *buf);
 long ossl_core_bio_ctrl(OSSL_CORE_BIO *cb, int cmd, long larg, void *parg);
diff --git a/include/internal/conf.h b/include/internal/conf.h
index 8c6c29cd2c5f..e4fb787798ac 100644
--- a/include/internal/conf.h
+++ b/include/internal/conf.h
@@ -8,15 +8,13 @@
  */
 
 #ifndef OSSL_INTERNAL_CONF_H
-# define OSSL_INTERNAL_CONF_H
-# pragma once
+#define OSSL_INTERNAL_CONF_H
+#pragma once
 
-# include <openssl/conf.h>
+#include <openssl/conf.h>
 
-# define DEFAULT_CONF_MFLAGS \
-    (CONF_MFLAGS_DEFAULT_SECTION | \
-     CONF_MFLAGS_IGNORE_MISSING_FILE | \
-     CONF_MFLAGS_IGNORE_RETURN_CODES)
+#define DEFAULT_CONF_MFLAGS \
+    (CONF_MFLAGS_DEFAULT_SECTION | CONF_MFLAGS_IGNORE_MISSING_FILE | CONF_MFLAGS_IGNORE_RETURN_CODES)
 
 struct ossl_init_settings_st {
     char *filename;
diff --git a/include/internal/constant_time.h b/include/internal/constant_time.h
index 3583344b4d86..3a634c56173f 100644
--- a/include/internal/constant_time.h
+++ b/include/internal/constant_time.h
@@ -8,12 +8,12 @@
  */
 
 #ifndef OSSL_INTERNAL_CONSTANT_TIME_H
-# define OSSL_INTERNAL_CONSTANT_TIME_H
-# pragma once
+#define OSSL_INTERNAL_CONSTANT_TIME_H
+#pragma once
 
-# include <stdlib.h>
-# include <string.h>
-# include <openssl/e_os2.h>              /* For 'ossl_inline' */
+#include <stdlib.h>
+#include <string.h>
+#include <openssl/e_os2.h> /* For 'ossl_inline' */
 
 /*-
  * The boolean methods return a bitmask of all ones (0xff...f) for true
@@ -38,19 +38,19 @@ static ossl_inline uint64_t constant_time_msb_64(uint64_t a);
 
 /* Returns 0xff..f if a < b and 0 otherwise. */
 static ossl_inline unsigned int constant_time_lt(unsigned int a,
-                                                 unsigned int b);
+    unsigned int b);
 /* Convenience method for getting an 8-bit mask. */
 static ossl_inline unsigned char constant_time_lt_8(unsigned int a,
-                                                    unsigned int b);
+    unsigned int b);
 /* Convenience method for uint64_t. */
 static ossl_inline uint64_t constant_time_lt_64(uint64_t a, uint64_t b);
 
 /* Returns 0xff..f if a >= b and 0 otherwise. */
 static ossl_inline unsigned int constant_time_ge(unsigned int a,
-                                                 unsigned int b);
+    unsigned int b);
 /* Convenience method for getting an 8-bit mask. */
 static ossl_inline unsigned char constant_time_ge_8(unsigned int a,
-                                                    unsigned int b);
+    unsigned int b);
 
 /* Returns 0xff..f if a == 0 and 0 otherwise. */
 static ossl_inline unsigned int constant_time_is_zero(unsigned int a);
@@ -61,10 +61,10 @@ static ossl_inline uint32_t constant_time_is_zero_32(uint32_t a);
 
 /* Returns 0xff..f if a == b and 0 otherwise. */
 static ossl_inline unsigned int constant_time_eq(unsigned int a,
-                                                 unsigned int b);
+    unsigned int b);
 /* Convenience method for getting an 8-bit mask. */
 static ossl_inline unsigned char constant_time_eq_8(unsigned int a,
-                                                    unsigned int b);
+    unsigned int b);
 /* Signed integers. */
 static ossl_inline unsigned int constant_time_eq_int(int a, int b);
 /* Convenience method for getting an 8-bit mask. */
@@ -78,31 +78,29 @@ static ossl_inline unsigned char constant_time_eq_int_8(int a, int b);
  * (if |mask| is zero).
  */
 static ossl_inline unsigned int constant_time_select(unsigned int mask,
-                                                     unsigned int a,
-                                                     unsigned int b);
+    unsigned int a,
+    unsigned int b);
 /* Convenience method for unsigned chars. */
 static ossl_inline unsigned char constant_time_select_8(unsigned char mask,
-                                                        unsigned char a,
-                                                        unsigned char b);
+    unsigned char a,
+    unsigned char b);
 
 /* Convenience method for uint32_t. */
 static ossl_inline uint32_t constant_time_select_32(uint32_t mask, uint32_t a,
-                                                    uint32_t b);
+    uint32_t b);
 
 /* Convenience method for uint64_t. */
 static ossl_inline uint64_t constant_time_select_64(uint64_t mask, uint64_t a,
-                                                    uint64_t b);
+    uint64_t b);
 /* Convenience method for signed integers. */
 static ossl_inline int constant_time_select_int(unsigned int mask, int a,
-                                                int b);
-
+    int b);
 
 static ossl_inline unsigned int constant_time_msb(unsigned int a)
 {
     return 0 - (a >> (sizeof(a) * 8 - 1));
 }
 
-
 static ossl_inline uint32_t constant_time_msb_32(uint32_t a)
 {
     return 0 - (a >> 31);
@@ -119,7 +117,7 @@ static ossl_inline size_t constant_time_msb_s(size_t a)
 }
 
 static ossl_inline unsigned int constant_time_lt(unsigned int a,
-                                                 unsigned int b)
+    unsigned int b)
 {
     return constant_time_msb(a ^ ((a ^ b) | ((a - b) ^ b)));
 }
@@ -130,7 +128,7 @@ static ossl_inline size_t constant_time_lt_s(size_t a, size_t b)
 }
 
 static ossl_inline unsigned char constant_time_lt_8(unsigned int a,
-                                                    unsigned int b)
+    unsigned int b)
 {
     return (unsigned char)constant_time_lt(a, b);
 }
@@ -157,14 +155,14 @@ static ossl_inline BN_ULONG constant_time_is_zero_bn(BN_ULONG a)
 }
 
 static ossl_inline BN_ULONG constant_time_eq_bn(BN_ULONG a,
-                                                BN_ULONG b)
+    BN_ULONG b)
 {
     return constant_time_is_zero_bn(a ^ b);
 }
 #endif
 
 static ossl_inline unsigned int constant_time_ge(unsigned int a,
-                                                 unsigned int b)
+    unsigned int b)
 {
     return ~constant_time_lt(a, b);
 }
@@ -175,7 +173,7 @@ static ossl_inline size_t constant_time_ge_s(size_t a, size_t b)
 }
 
 static ossl_inline unsigned char constant_time_ge_8(unsigned int a,
-                                                    unsigned int b)
+    unsigned int b)
 {
     return (unsigned char)constant_time_ge(a, b);
 }
@@ -211,7 +209,7 @@ static ossl_inline uint64_t constant_time_is_zero_64(uint64_t a)
 }
 
 static ossl_inline unsigned int constant_time_eq(unsigned int a,
-                                                 unsigned int b)
+    unsigned int b)
 {
     return constant_time_is_zero(a ^ b);
 }
@@ -222,7 +220,7 @@ static ossl_inline size_t constant_time_eq_s(size_t a, size_t b)
 }
 
 static ossl_inline unsigned char constant_time_eq_8(unsigned int a,
-                                                    unsigned int b)
+    unsigned int b)
 {
     return (unsigned char)constant_time_eq(a, b);
 }
@@ -309,28 +307,28 @@ static ossl_inline unsigned char value_barrier_8(unsigned char a)
 }
 
 static ossl_inline unsigned int constant_time_select(unsigned int mask,
-                                                     unsigned int a,
-                                                     unsigned int b)
+    unsigned int a,
+    unsigned int b)
 {
     return (value_barrier(mask) & a) | (value_barrier(~mask) & b);
 }
 
 static ossl_inline size_t constant_time_select_s(size_t mask,
-                                                 size_t a,
-                                                 size_t b)
+    size_t a,
+    size_t b)
 {
     return (value_barrier_s(mask) & a) | (value_barrier_s(~mask) & b);
 }
 
 static ossl_inline unsigned char constant_time_select_8(unsigned char mask,
-                                                        unsigned char a,
-                                                        unsigned char b)
+    unsigned char a,
+    unsigned char b)
 {
     return (unsigned char)constant_time_select(mask, a, b);
 }
 
 static ossl_inline int constant_time_select_int(unsigned int mask, int a,
-                                                int b)
+    int b)
 {
     return (int)constant_time_select(mask, (unsigned)(a), (unsigned)(b));
 }
@@ -338,17 +336,17 @@ static ossl_inline int constant_time_select_int(unsigned int mask, int a,
 static ossl_inline int constant_time_select_int_s(size_t mask, int a, int b)
 {
     return (int)constant_time_select((unsigned)mask, (unsigned)(a),
-                                      (unsigned)(b));
+        (unsigned)(b));
 }
 
 static ossl_inline uint32_t constant_time_select_32(uint32_t mask, uint32_t a,
-                                                    uint32_t b)
+    uint32_t b)
 {
     return (value_barrier_32(mask) & a) | (value_barrier_32(~mask) & b);
 }
 
 static ossl_inline uint64_t constant_time_select_64(uint64_t mask, uint64_t a,
-                                                    uint64_t b)
+    uint64_t b)
 {
     return (value_barrier_64(mask) & a) | (value_barrier_64(~mask) & b);
 }
@@ -364,11 +362,11 @@ static ossl_inline uint64_t constant_time_select_64(uint64_t mask, uint64_t a,
  * }
  */
 static ossl_inline void constant_time_cond_swap_32(uint32_t mask, uint32_t *a,
-                                                   uint32_t *b)
+    uint32_t *b)
 {
     uint32_t xor = *a ^ *b;
 
-    xor &= value_barrier_32(mask);
+    xor&= value_barrier_32(mask);
     *a ^= xor;
     *b ^= xor;
 }
@@ -384,11 +382,11 @@ static ossl_inline void constant_time_cond_swap_32(uint32_t mask, uint32_t *a,
  * }
  */
 static ossl_inline void constant_time_cond_swap_64(uint64_t mask, uint64_t *a,
-                                                   uint64_t *b)
+    uint64_t *b)
 {
     uint64_t xor = *a ^ *b;
 
-    xor &= value_barrier_64(mask);
+    xor&= value_barrier_64(mask);
     *a ^= xor;
     *b ^= xor;
 }
@@ -406,9 +404,9 @@ static ossl_inline void constant_time_cond_swap_64(uint64_t mask, uint64_t *a,
  * }
  */
 static ossl_inline void constant_time_cond_swap_buff(unsigned char mask,
-                                                     unsigned char *a,
-                                                     unsigned char *b,
-                                                     size_t len)
+    unsigned char *a,
+    unsigned char *b,
+    size_t len)
 {
     size_t i;
     unsigned char tmp;
@@ -427,10 +425,10 @@ static ossl_inline void constant_time_cond_swap_buff(unsigned char mask,
  * private.
  */
 static ossl_inline void constant_time_lookup(void *out,
-                                             const void *table,
-                                             size_t rowsize,
-                                             size_t numrows,
-                                             size_t idx)
+    const void *table,
+    size_t rowsize,
+    size_t numrows,
+    size_t idx)
 {
     size_t i, j;
     const unsigned char *tablec = (const unsigned char *)table;
@@ -453,4 +451,4 @@ static ossl_inline void constant_time_lookup(void *out,
  */
 void err_clear_last_constant_time(int clear);
 
-#endif                          /* OSSL_INTERNAL_CONSTANT_TIME_H */
+#endif /* OSSL_INTERNAL_CONSTANT_TIME_H */
diff --git a/include/internal/core.h b/include/internal/core.h
index 03adb66bd342..ea4b57e18bbb 100644
--- a/include/internal/core.h
+++ b/include/internal/core.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_INTERNAL_CORE_H
-# define OSSL_INTERNAL_CORE_H
-# pragma once
+#define OSSL_INTERNAL_CORE_H
+#pragma once
 
 /*
  * namespaces:
@@ -38,30 +38,30 @@ typedef struct ossl_method_construct_method_st {
     void *(*get)(void *store, const OSSL_PROVIDER **prov, void *data);
     /* Store a method in a store */
     int (*put)(void *store, void *method, const OSSL_PROVIDER *prov,
-               const char *name, const char *propdef, void *data);
+        const char *name, const char *propdef, void *data);
     /* Construct a new method */
     void *(*construct)(const OSSL_ALGORITHM *algodef, OSSL_PROVIDER *prov,
-                       void *data);
+        void *data);
     /* Destruct a method */
     void (*destruct)(void *method, void *data);
 } OSSL_METHOD_CONSTRUCT_METHOD;
 
 void *ossl_method_construct(OSSL_LIB_CTX *ctx, int operation_id,
-                            OSSL_PROVIDER **provider_rw, int force_cache,
-                            OSSL_METHOD_CONSTRUCT_METHOD *mcm, void *mcm_data);
+    OSSL_PROVIDER **provider_rw, int force_cache,
+    OSSL_METHOD_CONSTRUCT_METHOD *mcm, void *mcm_data);
 
 void ossl_algorithm_do_all(OSSL_LIB_CTX *libctx, int operation_id,
-                           OSSL_PROVIDER *provider,
-                           int (*pre)(OSSL_PROVIDER *, int operation_id,
-                                      int no_store, void *data, int *result),
-                           int (*reserve_store)(int no_store, void *data),
-                           void (*fn)(OSSL_PROVIDER *provider,
-                                      const OSSL_ALGORITHM *algo,
-                                      int no_store, void *data),
-                           int (*unreserve_store)(void *data),
-                           int (*post)(OSSL_PROVIDER *, int operation_id,
-                                       int no_store, void *data, int *result),
-                           void *data);
+    OSSL_PROVIDER *provider,
+    int (*pre)(OSSL_PROVIDER *, int operation_id,
+        int no_store, void *data, int *result),
+    int (*reserve_store)(int no_store, void *data),
+    void (*fn)(OSSL_PROVIDER *provider,
+        const OSSL_ALGORITHM *algo,
+        int no_store, void *data),
+    int (*unreserve_store)(void *data),
+    int (*post)(OSSL_PROVIDER *, int operation_id,
+        int no_store, void *data, int *result),
+    void *data);
 char *ossl_algorithm_get1_first_name(const OSSL_ALGORITHM *algo);
 
 __owur int ossl_lib_ctx_write_lock(OSSL_LIB_CTX *ctx);
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index 934d4b089c20..b5db9c11983d 100644
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -8,31 +8,31 @@
  */
 
 #ifndef OSSL_INTERNAL_CRYPTLIB_H
-# define OSSL_INTERNAL_CRYPTLIB_H
-# pragma once
+#define OSSL_INTERNAL_CRYPTLIB_H
+#pragma once
 
-# include <stdlib.h>
-# include <string.h>
+#include <stdlib.h>
+#include <string.h>
 
-# ifdef OPENSSL_USE_APPLINK
-#  define BIO_FLAGS_UPLINK_INTERNAL 0x8000
-#  include "ms/uplink.h"
-# else
-#  define BIO_FLAGS_UPLINK_INTERNAL 0
-# endif
+#ifdef OPENSSL_USE_APPLINK
+#define BIO_FLAGS_UPLINK_INTERNAL 0x8000
+#include "ms/uplink.h"
+#else
+#define BIO_FLAGS_UPLINK_INTERNAL 0
+#endif
 
-# include <openssl/crypto.h>
-# include <openssl/buffer.h>
-# include <openssl/bio.h>
-# include <openssl/asn1.h>
-# include <openssl/err.h>
-# include "internal/nelem.h"
+#include <openssl/crypto.h>
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#include <openssl/err.h>
+#include "internal/nelem.h"
 
 #ifdef NDEBUG
-# define ossl_assert(x) ((x) != 0)
+#define ossl_assert(x) ((x) != 0)
 #else
 __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr,
-                                              const char *file, int line)
+    const char *file, int line)
 {
     if (!expr)
         OPENSSL_die(exprstr, file, line);
@@ -40,8 +40,8 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr,
     return expr;
 }
 
-# define ossl_assert(x) ossl_assert_int((x) != 0, "Assertion failed: "#x, \
-                                         __FILE__, __LINE__)
+#define ossl_assert(x) ossl_assert_int((x) != 0, "Assertion failed: " #x, \
+    __FILE__, __LINE__)
 
 #endif
 
@@ -50,9 +50,9 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr,
  * reasonable boundary for the platform.  The most pessimistic alignment
  * of the listed types will be used by the compiler.
  */
-# define OSSL_UNION_ALIGN       \
-    double align;               \
-    ossl_uintmax_t align_int;   \
+#define OSSL_UNION_ALIGN      \
+    double align;             \
+    ossl_uintmax_t align_int; \
     void *align_ptr
 
 typedef struct ex_callback_st EX_CALLBACK;
@@ -61,34 +61,32 @@ DEFINE_STACK_OF(EX_CALLBACK)
 typedef struct mem_st MEM;
 DEFINE_LHASH_OF(MEM);
 
-# define OPENSSL_CONF             "openssl.cnf"
+#define OPENSSL_CONF "openssl.cnf"
 
-# ifndef OPENSSL_SYS_VMS
-#  define X509_CERT_AREA          OPENSSLDIR
-#  define X509_CERT_DIR           OPENSSLDIR "/certs"
-#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
-#  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
-#  define CTLOG_FILE              OPENSSLDIR "/ct_log_list.cnf"
-# else
-#  define X509_CERT_AREA          "OSSL$DATAROOT:[000000]"
-#  define X509_CERT_DIR           "OSSL$DATAROOT:[CERTS]"
-#  define X509_CERT_FILE          "OSSL$DATAROOT:[000000]cert.pem"
-#  define X509_PRIVATE_DIR        "OSSL$DATAROOT:[PRIVATE]"
-#  define CTLOG_FILE              "OSSL$DATAROOT:[000000]ct_log_list.cnf"
-# endif
+#ifndef OPENSSL_SYS_VMS
+#define X509_CERT_AREA OPENSSLDIR
+#define X509_CERT_DIR OPENSSLDIR "/certs"
+#define X509_CERT_FILE OPENSSLDIR "/cert.pem"
+#define X509_PRIVATE_DIR OPENSSLDIR "/private"
+#define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf"
+#else
+#define X509_CERT_AREA "OSSL$DATAROOT:[000000]"
+#define X509_CERT_DIR "OSSL$DATAROOT:[CERTS]"
+#define X509_CERT_FILE "OSSL$DATAROOT:[000000]cert.pem"
+#define X509_PRIVATE_DIR "OSSL$DATAROOT:[PRIVATE]"
+#define CTLOG_FILE "OSSL$DATAROOT:[000000]ct_log_list.cnf"
+#endif
 
-# define X509_CERT_DIR_EVP        "SSL_CERT_DIR"
-# define X509_CERT_FILE_EVP       "SSL_CERT_FILE"
-# define CTLOG_FILE_EVP           "CTLOG_FILE"
+#define X509_CERT_DIR_EVP "SSL_CERT_DIR"
+#define X509_CERT_FILE_EVP "SSL_CERT_FILE"
+#define CTLOG_FILE_EVP "CTLOG_FILE"
 
 /* size of string representations */
-# define DECIMAL_SIZE(type)      ((sizeof(type)*8+2)/3+1)
-# define HEX_SIZE(type)          (sizeof(type)*2)
+#define DECIMAL_SIZE(type) ((sizeof(type) * 8 + 2) / 3 + 1)
+#define HEX_SIZE(type) (sizeof(type) * 2)
 
 void OPENSSL_cpuid_setup(void);
-#if defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
-    defined(__x86_64) || defined(__x86_64__) || \
-    defined(_M_AMD64) || defined(_M_X64)
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
 extern unsigned int OPENSSL_ia32cap_P[];
 #endif
 void OPENSSL_showfatal(const char *fmta, ...);
@@ -101,11 +99,11 @@ char *ossl_safe_getenv(const char *name);
 
 extern CRYPTO_RWLOCK *memdbg_lock;
 int openssl_strerror_r(int errnum, char *buf, size_t buflen);
-# if !defined(OPENSSL_NO_STDIO)
+#if !defined(OPENSSL_NO_STDIO)
 FILE *openssl_fopen(const char *filename, const char *mode);
-# else
+#else
 void *openssl_fopen(const char *filename, const char *mode);
-# endif
+#endif
 
 uint32_t OPENSSL_rdtsc(void);
 size_t OPENSSL_instrument_bus(unsigned int *, size_t);
@@ -118,9 +116,9 @@ size_t OPENSSL_instrument_bus2(unsigned int *, size_t, size_t);
  * exdata has a stack of callbacks for each instance.
  */
 struct ex_callback_st {
-    long argl;                  /* Arbitrary long */
-    void *argp;                 /* Arbitrary void * */
-    int priority;               /* Priority ordering for freeing */
+    long argl; /* Arbitrary long */
+    void *argp; /* Arbitrary void * */
+    int priority; /* Priority ordering for freeing */
     CRYPTO_EX_new *new_func;
     CRYPTO_EX_free *free_func;
     CRYPTO_EX_dup *dup_func;
@@ -139,41 +137,40 @@ typedef struct ossl_ex_data_global_st {
     EX_CALLBACKS ex_data[CRYPTO_EX_INDEX__COUNT];
 } OSSL_EX_DATA_GLOBAL;
 
-
 /* OSSL_LIB_CTX */
 
-# define OSSL_LIB_CTX_PROVIDER_STORE_RUN_ONCE_INDEX          0
-# define OSSL_LIB_CTX_DEFAULT_METHOD_STORE_RUN_ONCE_INDEX    1
-# define OSSL_LIB_CTX_METHOD_STORE_RUN_ONCE_INDEX            2
-# define OSSL_LIB_CTX_MAX_RUN_ONCE                           3
+#define OSSL_LIB_CTX_PROVIDER_STORE_RUN_ONCE_INDEX 0
+#define OSSL_LIB_CTX_DEFAULT_METHOD_STORE_RUN_ONCE_INDEX 1
+#define OSSL_LIB_CTX_METHOD_STORE_RUN_ONCE_INDEX 2
+#define OSSL_LIB_CTX_MAX_RUN_ONCE 3
 
-# define OSSL_LIB_CTX_EVP_METHOD_STORE_INDEX         0
-# define OSSL_LIB_CTX_PROVIDER_STORE_INDEX           1
-# define OSSL_LIB_CTX_PROPERTY_DEFN_INDEX            2
-# define OSSL_LIB_CTX_PROPERTY_STRING_INDEX          3
-# define OSSL_LIB_CTX_NAMEMAP_INDEX                  4
-# define OSSL_LIB_CTX_DRBG_INDEX                     5
-# define OSSL_LIB_CTX_DRBG_NONCE_INDEX               6
-# define OSSL_LIB_CTX_RAND_CRNGT_INDEX               7
-# ifdef FIPS_MODULE
-#  define OSSL_LIB_CTX_THREAD_EVENT_HANDLER_INDEX    8
-# endif
-# define OSSL_LIB_CTX_FIPS_PROV_INDEX                9
-# define OSSL_LIB_CTX_ENCODER_STORE_INDEX           10
-# define OSSL_LIB_CTX_DECODER_STORE_INDEX           11
-# define OSSL_LIB_CTX_SELF_TEST_CB_INDEX            12
-# define OSSL_LIB_CTX_BIO_PROV_INDEX                13
-# define OSSL_LIB_CTX_GLOBAL_PROPERTIES             14
-# define OSSL_LIB_CTX_STORE_LOADER_STORE_INDEX      15
-# define OSSL_LIB_CTX_PROVIDER_CONF_INDEX           16
-# define OSSL_LIB_CTX_BIO_CORE_INDEX                17
-# define OSSL_LIB_CTX_CHILD_PROVIDER_INDEX          18
-# define OSSL_LIB_CTX_MAX_INDEXES                   19
+#define OSSL_LIB_CTX_EVP_METHOD_STORE_INDEX 0
+#define OSSL_LIB_CTX_PROVIDER_STORE_INDEX 1
+#define OSSL_LIB_CTX_PROPERTY_DEFN_INDEX 2
+#define OSSL_LIB_CTX_PROPERTY_STRING_INDEX 3
+#define OSSL_LIB_CTX_NAMEMAP_INDEX 4
+#define OSSL_LIB_CTX_DRBG_INDEX 5
+#define OSSL_LIB_CTX_DRBG_NONCE_INDEX 6
+#define OSSL_LIB_CTX_RAND_CRNGT_INDEX 7
+#ifdef FIPS_MODULE
+#define OSSL_LIB_CTX_THREAD_EVENT_HANDLER_INDEX 8
+#endif
+#define OSSL_LIB_CTX_FIPS_PROV_INDEX 9
+#define OSSL_LIB_CTX_ENCODER_STORE_INDEX 10
+#define OSSL_LIB_CTX_DECODER_STORE_INDEX 11
+#define OSSL_LIB_CTX_SELF_TEST_CB_INDEX 12
+#define OSSL_LIB_CTX_BIO_PROV_INDEX 13
+#define OSSL_LIB_CTX_GLOBAL_PROPERTIES 14
+#define OSSL_LIB_CTX_STORE_LOADER_STORE_INDEX 15
+#define OSSL_LIB_CTX_PROVIDER_CONF_INDEX 16
+#define OSSL_LIB_CTX_BIO_CORE_INDEX 17
+#define OSSL_LIB_CTX_CHILD_PROVIDER_INDEX 18
+#define OSSL_LIB_CTX_MAX_INDEXES 19
 
-# define OSSL_LIB_CTX_METHOD_LOW_PRIORITY          -1
-# define OSSL_LIB_CTX_METHOD_DEFAULT_PRIORITY       0
-# define OSSL_LIB_CTX_METHOD_PRIORITY_1             1
-# define OSSL_LIB_CTX_METHOD_PRIORITY_2             2
+#define OSSL_LIB_CTX_METHOD_LOW_PRIORITY -1
+#define OSSL_LIB_CTX_METHOD_DEFAULT_PRIORITY 0
+#define OSSL_LIB_CTX_METHOD_PRIORITY_1 1
+#define OSSL_LIB_CTX_METHOD_PRIORITY_2 2
 
 typedef struct ossl_lib_ctx_method {
     int priority;
@@ -187,15 +184,15 @@ int ossl_lib_ctx_is_global_default(OSSL_LIB_CTX *ctx);
 
 /* Functions to retrieve pointers to data by index */
 void *ossl_lib_ctx_get_data(OSSL_LIB_CTX *, int /* index */,
-                            const OSSL_LIB_CTX_METHOD * ctx);
+    const OSSL_LIB_CTX_METHOD *ctx);
 
 void ossl_lib_ctx_default_deinit(void);
 OSSL_EX_DATA_GLOBAL *ossl_lib_ctx_get_ex_data_global(OSSL_LIB_CTX *ctx);
-typedef int (ossl_lib_ctx_run_once_fn)(OSSL_LIB_CTX *ctx);
-typedef void (ossl_lib_ctx_onfree_fn)(OSSL_LIB_CTX *ctx);
+typedef int(ossl_lib_ctx_run_once_fn)(OSSL_LIB_CTX *ctx);
+typedef void(ossl_lib_ctx_onfree_fn)(OSSL_LIB_CTX *ctx);
 
 int ossl_lib_ctx_run_once(OSSL_LIB_CTX *ctx, unsigned int idx,
-                          ossl_lib_ctx_run_once_fn run_once_fn);
+    ossl_lib_ctx_run_once_fn run_once_fn);
 int ossl_lib_ctx_onfree(OSSL_LIB_CTX *ctx, ossl_lib_ctx_onfree_fn onfreefn);
 const char *ossl_lib_ctx_get_descriptor(OSSL_LIB_CTX *libctx);
 
@@ -203,60 +200,60 @@ void ossl_release_default_drbg_ctx(void);
 
 OSSL_LIB_CTX *ossl_crypto_ex_data_get_ossl_lib_ctx(const CRYPTO_EX_DATA *ad);
 int ossl_crypto_new_ex_data_ex(OSSL_LIB_CTX *ctx, int class_index, void *obj,
-                               CRYPTO_EX_DATA *ad);
+    CRYPTO_EX_DATA *ad);
 int ossl_crypto_get_ex_new_index_ex(OSSL_LIB_CTX *ctx, int class_index,
-                                    long argl, void *argp,
-                                    CRYPTO_EX_new *new_func,
-                                    CRYPTO_EX_dup *dup_func,
-                                    CRYPTO_EX_free *free_func,
-                                    int priority);
+    long argl, void *argp,
+    CRYPTO_EX_new *new_func,
+    CRYPTO_EX_dup *dup_func,
+    CRYPTO_EX_free *free_func,
+    int priority);
 int ossl_crypto_free_ex_index_ex(OSSL_LIB_CTX *ctx, int class_index, int idx);
 
 /* Function for simple binary search */
 
 /* Flags */
-# define OSSL_BSEARCH_VALUE_ON_NOMATCH            0x01
-# define OSSL_BSEARCH_FIRST_VALUE_ON_MATCH        0x02
+#define OSSL_BSEARCH_VALUE_ON_NOMATCH 0x01
+#define OSSL_BSEARCH_FIRST_VALUE_ON_MATCH 0x02
 
 const void *ossl_bsearch(const void *key, const void *base, int num,
-                         int size, int (*cmp) (const void *, const void *),
-                         int flags);
+    int size, int (*cmp)(const void *, const void *),
+    int flags);
 
 char *ossl_sk_ASN1_UTF8STRING2text(STACK_OF(ASN1_UTF8STRING) *text,
-                                   const char *sep, size_t max_len);
+    const char *sep, size_t max_len);
 char *ossl_ipaddr_to_asc(unsigned char *p, int len);
 
 char *ossl_buf2hexstr_sep(const unsigned char *buf, long buflen, char sep);
 unsigned char *ossl_hexstr2buf_sep(const char *str, long *buflen,
-                                   const char sep);
+    const char sep);
 
 static ossl_inline int ossl_ends_with_dirsep(const char *path)
 {
     if (*path != '\0')
         path += strlen(path) - 1;
-# if defined __VMS
+#if defined __VMS
     if (*path == ']' || *path == '>' || *path == ':')
         return 1;
-# elif defined _WIN32
+#elif defined _WIN32
     if (*path == '\\')
         return 1;
-# endif
+#endif
     return *path == '/';
 }
 
 static ossl_inline int ossl_is_absolute_path(const char *path)
 {
-# if defined __VMS
+#if defined __VMS
     if (strchr(path, ':') != NULL
         || ((path[0] == '[' || path[0] == '<')
             && path[1] != '.' && path[1] != '-'
             && path[1] != ']' && path[1] != '>'))
         return 1;
-# elif defined _WIN32
+#elif defined _WIN32
     if (path[0] == '\\'
         || (path[0] != '\0' && path[1] == ':'))
         return 1;
-# endif
+#endif
     return path[0] == '/';
 }
 
diff --git a/include/internal/dane.h b/include/internal/dane.h
index a3d78a7f8050..9c040eedc683 100644
--- a/include/internal/dane.h
+++ b/include/internal/dane.h
@@ -9,36 +9,36 @@
 
 #ifndef OSSL_INTERNAL_DANE_H
 #define OSSL_INTERNAL_DANE_H
-# pragma once
+#pragma once
 
-# include <openssl/safestack.h>
+#include <openssl/safestack.h>
 
 /*-
  * Certificate usages:
  * https://tools.ietf.org/html/rfc6698#section-2.1.1
  */
-#define DANETLS_USAGE_PKIX_TA   0
-#define DANETLS_USAGE_PKIX_EE   1
-#define DANETLS_USAGE_DANE_TA   2
-#define DANETLS_USAGE_DANE_EE   3
-#define DANETLS_USAGE_LAST      DANETLS_USAGE_DANE_EE
+#define DANETLS_USAGE_PKIX_TA 0
+#define DANETLS_USAGE_PKIX_EE 1
+#define DANETLS_USAGE_DANE_TA 2
+#define DANETLS_USAGE_DANE_EE 3
+#define DANETLS_USAGE_LAST DANETLS_USAGE_DANE_EE
 
 /*-
  * Selectors:
  * https://tools.ietf.org/html/rfc6698#section-2.1.2
  */
-#define DANETLS_SELECTOR_CERT   0
-#define DANETLS_SELECTOR_SPKI   1
-#define DANETLS_SELECTOR_LAST   DANETLS_SELECTOR_SPKI
+#define DANETLS_SELECTOR_CERT 0
+#define DANETLS_SELECTOR_SPKI 1
+#define DANETLS_SELECTOR_LAST DANETLS_SELECTOR_SPKI
 
 /*-
  * Matching types:
  * https://tools.ietf.org/html/rfc6698#section-2.1.3
  */
-#define DANETLS_MATCHING_FULL   0
-#define DANETLS_MATCHING_2256   1
-#define DANETLS_MATCHING_2512   2
-#define DANETLS_MATCHING_LAST   DANETLS_MATCHING_2512
+#define DANETLS_MATCHING_FULL 0
+#define DANETLS_MATCHING_2256 1
+#define DANETLS_MATCHING_2512 2
+#define DANETLS_MATCHING_LAST DANETLS_MATCHING_2512
 
 typedef struct danetls_record_st {
     uint8_t usage;
@@ -55,10 +55,10 @@ DEFINE_STACK_OF(danetls_record)
  * Shared DANE context
  */
 struct dane_ctx_st {
-    const EVP_MD  **mdevp;      /* mtype -> digest */
-    uint8_t        *mdord;      /* mtype -> preference */
-    uint8_t         mdmax;      /* highest supported mtype */
-    unsigned long   flags;      /* feature bitmask */
+    const EVP_MD **mdevp; /* mtype -> digest */
+    uint8_t *mdord; /* mtype -> preference */
+    uint8_t mdmax; /* highest supported mtype */
+    unsigned long flags; /* feature bitmask */
 };
 
 /*
@@ -67,19 +67,19 @@ struct dane_ctx_st {
 struct ssl_dane_st {
     struct dane_ctx_st *dctx;
     STACK_OF(danetls_record) *trecs;
-    STACK_OF(X509) *certs;      /* DANE-TA(2) Cert(0) Full(0) certs */
-    danetls_record *mtlsa;      /* Matching TLSA record */
-    X509           *mcert;      /* DANE matched cert */
-    uint32_t        umask;      /* Usages present */
-    int             mdpth;      /* Depth of matched cert */
-    int             pdpth;      /* Depth of PKIX trust */
-    unsigned long   flags;      /* feature bitmask */
+    STACK_OF(X509) *certs; /* DANE-TA(2) Cert(0) Full(0) certs */
+    danetls_record *mtlsa; /* Matching TLSA record */
+    X509 *mcert; /* DANE matched cert */
+    uint32_t umask; /* Usages present */
+    int mdpth; /* Depth of matched cert */
+    int pdpth; /* Depth of PKIX trust */
+    unsigned long flags; /* feature bitmask */
 };
 
-#define DANETLS_ENABLED(dane)  \
+#define DANETLS_ENABLED(dane) \
     ((dane) != NULL && sk_danetls_record_num((dane)->trecs) > 0)
 
-#define DANETLS_USAGE_BIT(u)   (((uint32_t)1) << u)
+#define DANETLS_USAGE_BIT(u) (((uint32_t)1) << u)
 
 #define DANETLS_PKIX_TA_MASK (DANETLS_USAGE_BIT(DANETLS_USAGE_PKIX_TA))
 #define DANETLS_PKIX_EE_MASK (DANETLS_USAGE_BIT(DANETLS_USAGE_PKIX_EE))
@@ -93,12 +93,12 @@ struct ssl_dane_st {
 
 #define DANETLS_HAS_PKIX(dane) ((dane) && ((dane)->umask & DANETLS_PKIX_MASK))
 #define DANETLS_HAS_DANE(dane) ((dane) && ((dane)->umask & DANETLS_DANE_MASK))
-#define DANETLS_HAS_TA(dane)   ((dane) && ((dane)->umask & DANETLS_TA_MASK))
-#define DANETLS_HAS_EE(dane)   ((dane) && ((dane)->umask & DANETLS_EE_MASK))
+#define DANETLS_HAS_TA(dane) ((dane) && ((dane)->umask & DANETLS_TA_MASK))
+#define DANETLS_HAS_EE(dane) ((dane) && ((dane)->umask & DANETLS_EE_MASK))
 
-#define DANETLS_HAS_PKIX_TA(dane) ((dane)&&((dane)->umask & DANETLS_PKIX_TA_MASK))
-#define DANETLS_HAS_PKIX_EE(dane) ((dane)&&((dane)->umask & DANETLS_PKIX_EE_MASK))
-#define DANETLS_HAS_DANE_TA(dane) ((dane)&&((dane)->umask & DANETLS_DANE_TA_MASK))
-#define DANETLS_HAS_DANE_EE(dane) ((dane)&&((dane)->umask & DANETLS_DANE_EE_MASK))
+#define DANETLS_HAS_PKIX_TA(dane) ((dane) && ((dane)->umask & DANETLS_PKIX_TA_MASK))
+#define DANETLS_HAS_PKIX_EE(dane) ((dane) && ((dane)->umask & DANETLS_PKIX_EE_MASK))
+#define DANETLS_HAS_DANE_TA(dane) ((dane) && ((dane)->umask & DANETLS_DANE_TA_MASK))
+#define DANETLS_HAS_DANE_EE(dane) ((dane) && ((dane)->umask & DANETLS_DANE_EE_MASK))
 
 #endif /* OSSL_INTERNAL_DANE_H */
diff --git a/include/internal/deprecated.h b/include/internal/deprecated.h
index a313a015459e..2675c49f7226 100644
--- a/include/internal/deprecated.h
+++ b/include/internal/deprecated.h
@@ -17,14 +17,14 @@
  */
 
 #ifndef OSSL_INTERNAL_DEPRECATED_H
-# define OSSL_INTERNAL_DEPRECATED_H
-# pragma once
+#define OSSL_INTERNAL_DEPRECATED_H
+#pragma once
 
-# include <openssl/configuration.h>
+#include <openssl/configuration.h>
 
-# undef OPENSSL_NO_DEPRECATED
-# define OPENSSL_SUPPRESS_DEPRECATED
+#undef OPENSSL_NO_DEPRECATED
+#define OPENSSL_SUPPRESS_DEPRECATED
 
-# include <openssl/macros.h>
+#include <openssl/macros.h>
 
 #endif
diff --git a/include/internal/der.h b/include/internal/der.h
index f23fabc29022..7c56f5dd5fd5 100644
--- a/include/internal/der.h
+++ b/include/internal/der.h
@@ -22,42 +22,42 @@
  * These are only valid for the UNIVERSAL class.  With the other classes,
  * these bits have a different meaning.
  */
-#define DER_P_EOC                       0 /* BER End Of Contents tag */
-#define DER_P_BOOLEAN                   1
-#define DER_P_INTEGER                   2
-#define DER_P_BIT_STRING                3
-#define DER_P_OCTET_STRING              4
-#define DER_P_NULL                      5
-#define DER_P_OBJECT                    6
-#define DER_P_OBJECT_DESCRIPTOR         7
-#define DER_P_EXTERNAL                  8
-#define DER_P_REAL                      9
-#define DER_P_ENUMERATED               10
-#define DER_P_UTF8STRING               12
-#define DER_P_SEQUENCE                 16
-#define DER_P_SET                      17
-#define DER_P_NUMERICSTRING            18
-#define DER_P_PRINTABLESTRING          19
-#define DER_P_T61STRING                20
-#define DER_P_VIDEOTEXSTRING           21
-#define DER_P_IA5STRING                22
-#define DER_P_UTCTIME                  23
-#define DER_P_GENERALIZEDTIME          24
-#define DER_P_GRAPHICSTRING            25
-#define DER_P_ISO64STRING              26
-#define DER_P_GENERALSTRING            27
-#define DER_P_UNIVERSALSTRING          28
-#define DER_P_BMPSTRING                30
+#define DER_P_EOC 0 /* BER End Of Contents tag */
+#define DER_P_BOOLEAN 1
+#define DER_P_INTEGER 2
+#define DER_P_BIT_STRING 3
+#define DER_P_OCTET_STRING 4
+#define DER_P_NULL 5
+#define DER_P_OBJECT 6
+#define DER_P_OBJECT_DESCRIPTOR 7
+#define DER_P_EXTERNAL 8
+#define DER_P_REAL 9
+#define DER_P_ENUMERATED 10
+#define DER_P_UTF8STRING 12
+#define DER_P_SEQUENCE 16
+#define DER_P_SET 17
+#define DER_P_NUMERICSTRING 18
+#define DER_P_PRINTABLESTRING 19
+#define DER_P_T61STRING 20
+#define DER_P_VIDEOTEXSTRING 21
+#define DER_P_IA5STRING 22
+#define DER_P_UTCTIME 23
+#define DER_P_GENERALIZEDTIME 24
+#define DER_P_GRAPHICSTRING 25
+#define DER_P_ISO64STRING 26
+#define DER_P_GENERALSTRING 27
+#define DER_P_UNIVERSALSTRING 28
+#define DER_P_BMPSTRING 30
 
 /* DER Flags, occupying bit 6 in the DER identifier byte */
-#define DER_F_PRIMITIVE              0x00
-#define DER_F_CONSTRUCTED            0x20
+#define DER_F_PRIMITIVE 0x00
+#define DER_F_CONSTRUCTED 0x20
 
 /* DER classes tags, occupying bits 7-8 in the DER identifier byte */
-#define DER_C_UNIVERSAL              0x00
-#define DER_C_APPLICATION            0x40
-#define DER_C_CONTEXT                0x80
-#define DER_C_PRIVATE                0xC0
+#define DER_C_UNIVERSAL 0x00
+#define DER_C_APPLICATION 0x40
+#define DER_C_CONTEXT 0x80
+#define DER_C_PRIVATE 0xC0
 
 /*
  * Run-time constructors.
@@ -67,18 +67,18 @@
  */
 
 /* This can be used for all items that don't have a context */
-#define DER_NO_CONTEXT  -1
+#define DER_NO_CONTEXT -1
 
 int ossl_DER_w_precompiled(WPACKET *pkt, int tag,
-                           const unsigned char *precompiled,
-                           size_t precompiled_n);
+    const unsigned char *precompiled,
+    size_t precompiled_n);
 
 int ossl_DER_w_boolean(WPACKET *pkt, int tag, int b);
 int ossl_DER_w_uint32(WPACKET *pkt, int tag, uint32_t v);
 int ossl_DER_w_bn(WPACKET *pkt, int tag, const BIGNUM *v);
 int ossl_DER_w_null(WPACKET *pkt, int tag);
 int ossl_DER_w_octet_string(WPACKET *pkt, int tag,
-                            const unsigned char *data, size_t data_n);
+    const unsigned char *data, size_t data_n);
 int ossl_DER_w_octet_string_uint32(WPACKET *pkt, int tag, uint32_t value);
 
 /*
diff --git a/include/internal/dso.h b/include/internal/dso.h
index 160ddb98db14..0f3edbff99c8 100644
--- a/include/internal/dso.h
+++ b/include/internal/dso.h
@@ -8,16 +8,16 @@
  */
 
 #ifndef OSSL_INTERNAL_DSO_H
-# define OSSL_INTERNAL_DSO_H
-# pragma once
+#define OSSL_INTERNAL_DSO_H
+#pragma once
 
-# include <openssl/crypto.h>
-# include "internal/dsoerr.h"
+#include <openssl/crypto.h>
+#include "internal/dsoerr.h"
 
 /* These values are used as commands to DSO_ctrl() */
-# define DSO_CTRL_GET_FLAGS      1
-# define DSO_CTRL_SET_FLAGS      2
-# define DSO_CTRL_OR_FLAGS       3
+#define DSO_CTRL_GET_FLAGS 1
+#define DSO_CTRL_SET_FLAGS 2
+#define DSO_CTRL_OR_FLAGS 3
 
 /*
  * By default, DSO_load() will translate the provided filename into a form
@@ -30,7 +30,7 @@
  * the caller has prompted the user for a path to a driver library so the
  * filename should be interpreted as-is.
  */
-# define DSO_FLAG_NO_NAME_TRANSLATION            0x01
+#define DSO_FLAG_NO_NAME_TRANSLATION 0x01
 /*
  * An extra flag to give if only the extension should be added as
  * translation.  This is obviously only of importance on Unix and other
@@ -38,21 +38,21 @@
  * something, like 'lib', and ignored everywhere else. This flag is also
  * ignored if DSO_FLAG_NO_NAME_TRANSLATION is used at the same time.
  */
-# define DSO_FLAG_NAME_TRANSLATION_EXT_ONLY      0x02
+#define DSO_FLAG_NAME_TRANSLATION_EXT_ONLY 0x02
 
 /*
  * Don't unload the DSO when we call DSO_free()
  */
-# define DSO_FLAG_NO_UNLOAD_ON_FREE              0x04
+#define DSO_FLAG_NO_UNLOAD_ON_FREE 0x04
 
 /*
  * This flag loads the library with public symbols. Meaning: The exported
  * symbols of this library are public to all libraries loaded after this
  * library. At the moment only implemented in unix.
  */
-# define DSO_FLAG_GLOBAL_SYMBOLS                 0x20
+#define DSO_FLAG_GLOBAL_SYMBOLS 0x20
 
-typedef void (*DSO_FUNC_TYPE) (void);
+typedef void (*DSO_FUNC_TYPE)(void);
 
 typedef struct dso_st DSO;
 typedef struct dso_meth_st DSO_METHOD;
diff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h
index b1719e8377f4..3b1de62fccc4 100644
--- a/include/internal/dsoerr.h
+++ b/include/internal/dsoerr.h
@@ -9,40 +9,39 @@
  */
 
 #ifndef OSSL_INTERNAL_DSOERR_H
-# define OSSL_INTERNAL_DSOERR_H
-# pragma once
+#define OSSL_INTERNAL_DSOERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 int ossl_err_load_DSO_strings(void);
 
 /*
  * DSO reason codes.
  */
-# define DSO_R_CTRL_FAILED                                100
-# define DSO_R_DSO_ALREADY_LOADED                         110
-# define DSO_R_EMPTY_FILE_STRUCTURE                       113
-# define DSO_R_FAILURE                                    114
-# define DSO_R_FILENAME_TOO_BIG                           101
-# define DSO_R_FINISH_FAILED                              102
-# define DSO_R_INCORRECT_FILE_SYNTAX                      115
-# define DSO_R_LOAD_FAILED                                103
-# define DSO_R_NAME_TRANSLATION_FAILED                    109
-# define DSO_R_NO_FILENAME                                111
-# define DSO_R_NULL_HANDLE                                104
-# define DSO_R_SET_FILENAME_FAILED                        112
-# define DSO_R_STACK_ERROR                                105
-# define DSO_R_SYM_FAILURE                                106
-# define DSO_R_UNLOAD_FAILED                              107
-# define DSO_R_UNSUPPORTED                                108
-
+#define DSO_R_CTRL_FAILED 100
+#define DSO_R_DSO_ALREADY_LOADED 110
+#define DSO_R_EMPTY_FILE_STRUCTURE 113
+#define DSO_R_FAILURE 114
+#define DSO_R_FILENAME_TOO_BIG 101
+#define DSO_R_FINISH_FAILED 102
+#define DSO_R_INCORRECT_FILE_SYNTAX 115
+#define DSO_R_LOAD_FAILED 103
+#define DSO_R_NAME_TRANSLATION_FAILED 109
+#define DSO_R_NO_FILENAME 111
+#define DSO_R_NULL_HANDLE 104
+#define DSO_R_SET_FILENAME_FAILED 112
+#define DSO_R_STACK_ERROR 105
+#define DSO_R_SYM_FAILURE 106
+#define DSO_R_UNLOAD_FAILED 107
+#define DSO_R_UNSUPPORTED 108
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/internal/endian.h b/include/internal/endian.h
index 8b34e03e4404..8d5880482a7a 100644
--- a/include/internal/endian.h
+++ b/include/internal/endian.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,11 +8,11 @@
  */
 
 #ifndef OSSL_INTERNAL_ENDIAN_H
-# define OSSL_INTERNAL_ENDIAN_H
-# pragma once
+#define OSSL_INTERNAL_ENDIAN_H
+#pragma once
 
 /*
- * IS_LITTLE_ENDIAN and IS_BIG_ENDIAN can be used to detect the endiannes
+ * IS_LITTLE_ENDIAN and IS_BIG_ENDIAN can be used to detect the endianness
  * at compile time. To use it, DECLARE_IS_ENDIAN must be used to declare
  * a variable.
  *
@@ -21,31 +21,31 @@
  * set, it will fall back to code works with either endianness.
  */
 
-# if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)
-#  define DECLARE_IS_ENDIAN const int ossl_is_little_endian = __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define IS_LITTLE_ENDIAN (ossl_is_little_endian)
-#  define IS_BIG_ENDIAN (!ossl_is_little_endian)
-#  if defined(L_ENDIAN) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
-#   error "L_ENDIAN defined on a big endian machine"
-#  endif
-#  if defined(B_ENDIAN) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#   error "B_ENDIAN defined on a little endian machine"
-#  endif
-#  if !defined(L_ENDIAN) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#   define L_ENDIAN
-#  endif
-#  if !defined(B_ENDIAN) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
-#   define B_ENDIAN
-#  endif
-# else
-#  define DECLARE_IS_ENDIAN \
-    const union { \
-        long one; \
-        char little; \
+#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)
+#define DECLARE_IS_ENDIAN const int ossl_is_little_endian = __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define IS_LITTLE_ENDIAN (ossl_is_little_endian)
+#define IS_BIG_ENDIAN (!ossl_is_little_endian)
+#if defined(L_ENDIAN) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
+#error "L_ENDIAN defined on a big endian machine"
+#endif
+#if defined(B_ENDIAN) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+#error "B_ENDIAN defined on a little endian machine"
+#endif
+#if !defined(L_ENDIAN) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+#define L_ENDIAN
+#endif
+#if !defined(B_ENDIAN) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
+#define B_ENDIAN
+#endif
+#else
+#define DECLARE_IS_ENDIAN \
+    const union {         \
+        long one;         \
+        char little;      \
     } ossl_is_endian = { 1 }
 
-#  define IS_LITTLE_ENDIAN (ossl_is_endian.little != 0)
-#  define IS_BIG_ENDIAN    (ossl_is_endian.little == 0)
-# endif
+#define IS_LITTLE_ENDIAN (ossl_is_endian.little != 0)
+#define IS_BIG_ENDIAN (ossl_is_endian.little == 0)
+#endif
 
 #endif
diff --git a/include/internal/err.h b/include/internal/err.h
index d8a308f0b46f..41b28ac47311 100644
--- a/include/internal/err.h
+++ b/include/internal/err.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_INTERNAL_ERR_H
-# define OSSL_INTERNAL_ERR_H
-# pragma once
+#define OSSL_INTERNAL_ERR_H
+#pragma once
 
 void err_free_strings_int(void);
 
diff --git a/include/internal/ffc.h b/include/internal/ffc.h
index e96f08d68e93..b204955d4c09 100644
--- a/include/internal/ffc.h
+++ b/include/internal/ffc.h
@@ -8,41 +8,41 @@
  */
 
 #ifndef OSSL_INTERNAL_FFC_H
-# define OSSL_INTERNAL_FFC_H
-# pragma once
+#define OSSL_INTERNAL_FFC_H
+#pragma once
 
-# include <openssl/core.h>
-# include <openssl/bn.h>
-# include <openssl/evp.h>
-# include <openssl/dh.h> /* Uses Error codes from DH */
-# include <openssl/params.h>
-# include <openssl/param_build.h>
-# include "internal/sizes.h"
+#include <openssl/core.h>
+#include <openssl/bn.h>
+#include <openssl/evp.h>
+#include <openssl/dh.h> /* Uses Error codes from DH */
+#include <openssl/params.h>
+#include <openssl/param_build.h>
+#include "internal/sizes.h"
 
 /* Default value for gindex when canonical generation of g is not used */
-# define FFC_UNVERIFIABLE_GINDEX -1
+#define FFC_UNVERIFIABLE_GINDEX -1
 
 /* The different types of FFC keys */
-# define FFC_PARAM_TYPE_DSA  0
-# define FFC_PARAM_TYPE_DH   1
+#define FFC_PARAM_TYPE_DSA 0
+#define FFC_PARAM_TYPE_DH 1
 
 /*
  * The mode used by functions that share code for both generation and
  * verification. See ossl_ffc_params_FIPS186_4_gen_verify().
  */
-#define FFC_PARAM_MODE_VERIFY   0
+#define FFC_PARAM_MODE_VERIFY 0
 #define FFC_PARAM_MODE_GENERATE 1
 
 /* Return codes for generation and validation of FFC parameters */
-#define FFC_PARAM_RET_STATUS_FAILED         0
-#define FFC_PARAM_RET_STATUS_SUCCESS        1
+#define FFC_PARAM_RET_STATUS_FAILED 0
+#define FFC_PARAM_RET_STATUS_SUCCESS 1
 /* Returned if validating and g is only partially verifiable */
 #define FFC_PARAM_RET_STATUS_UNVERIFIABLE_G 2
 
 /* Validation flags */
-# define FFC_PARAM_FLAG_VALIDATE_PQ    0x01
-# define FFC_PARAM_FLAG_VALIDATE_G     0x02
-# define FFC_PARAM_FLAG_VALIDATE_PQG                                           \
+#define FFC_PARAM_FLAG_VALIDATE_PQ 0x01
+#define FFC_PARAM_FLAG_VALIDATE_G 0x02
+#define FFC_PARAM_FLAG_VALIDATE_PQG \
     (FFC_PARAM_FLAG_VALIDATE_PQ | FFC_PARAM_FLAG_VALIDATE_G)
 #define FFC_PARAM_FLAG_VALIDATE_LEGACY 0x04
 
@@ -50,38 +50,38 @@
  * NB: These values must align with the equivalently named macros in
  * openssl/dh.h. We cannot use those macros here in case DH has been disabled.
  */
-# define FFC_CHECK_P_NOT_PRIME                0x00001
-# define FFC_CHECK_P_NOT_SAFE_PRIME           0x00002
-# define FFC_CHECK_UNKNOWN_GENERATOR          0x00004
-# define FFC_CHECK_NOT_SUITABLE_GENERATOR     0x00008
-# define FFC_CHECK_Q_NOT_PRIME                0x00010
-# define FFC_CHECK_INVALID_Q_VALUE            0x00020
-# define FFC_CHECK_INVALID_J_VALUE            0x00040
+#define FFC_CHECK_P_NOT_PRIME 0x00001
+#define FFC_CHECK_P_NOT_SAFE_PRIME 0x00002
+#define FFC_CHECK_UNKNOWN_GENERATOR 0x00004
+#define FFC_CHECK_NOT_SUITABLE_GENERATOR 0x00008
+#define FFC_CHECK_Q_NOT_PRIME 0x00010
+#define FFC_CHECK_INVALID_Q_VALUE 0x00020
+#define FFC_CHECK_INVALID_J_VALUE 0x00040
 
 /*
  * 0x80, 0x100 reserved by include/openssl/dh.h with check bits that are not
  * relevant for FFC.
  */
 
-# define FFC_CHECK_MISSING_SEED_OR_COUNTER    0x00200
-# define FFC_CHECK_INVALID_G                  0x00400
-# define FFC_CHECK_INVALID_PQ                 0x00800
-# define FFC_CHECK_INVALID_COUNTER            0x01000
-# define FFC_CHECK_P_MISMATCH                 0x02000
-# define FFC_CHECK_Q_MISMATCH                 0x04000
-# define FFC_CHECK_G_MISMATCH                 0x08000
-# define FFC_CHECK_COUNTER_MISMATCH           0x10000
-# define FFC_CHECK_BAD_LN_PAIR                0x20000
-# define FFC_CHECK_INVALID_SEED_SIZE          0x40000
+#define FFC_CHECK_MISSING_SEED_OR_COUNTER 0x00200
+#define FFC_CHECK_INVALID_G 0x00400
+#define FFC_CHECK_INVALID_PQ 0x00800
+#define FFC_CHECK_INVALID_COUNTER 0x01000
+#define FFC_CHECK_P_MISMATCH 0x02000
+#define FFC_CHECK_Q_MISMATCH 0x04000
+#define FFC_CHECK_G_MISMATCH 0x08000
+#define FFC_CHECK_COUNTER_MISMATCH 0x10000
+#define FFC_CHECK_BAD_LN_PAIR 0x20000
+#define FFC_CHECK_INVALID_SEED_SIZE 0x40000
 
 /* Validation Return codes */
-# define FFC_ERROR_PUBKEY_TOO_SMALL       0x01
-# define FFC_ERROR_PUBKEY_TOO_LARGE       0x02
-# define FFC_ERROR_PUBKEY_INVALID         0x04
-# define FFC_ERROR_NOT_SUITABLE_GENERATOR 0x08
-# define FFC_ERROR_PRIVKEY_TOO_SMALL      0x10
-# define FFC_ERROR_PRIVKEY_TOO_LARGE      0x20
-# define FFC_ERROR_PASSED_NULL_PARAM      0x40
+#define FFC_ERROR_PUBKEY_TOO_SMALL 0x01
+#define FFC_ERROR_PUBKEY_TOO_LARGE 0x02
+#define FFC_ERROR_PUBKEY_INVALID 0x04
+#define FFC_ERROR_NOT_SUITABLE_GENERATOR 0x08
+#define FFC_ERROR_PRIVKEY_TOO_SMALL 0x10
+#define FFC_ERROR_PRIVKEY_TOO_LARGE 0x20
+#define FFC_ERROR_PASSED_NULL_PARAM 0x40
 
 /*
  * Finite field cryptography (FFC) domain parameters are used by DH and DSA.
@@ -125,26 +125,26 @@ typedef struct ffc_params_st {
 void ossl_ffc_params_init(FFC_PARAMS *params);
 void ossl_ffc_params_cleanup(FFC_PARAMS *params);
 void ossl_ffc_params_set0_pqg(FFC_PARAMS *params, BIGNUM *p, BIGNUM *q,
-                              BIGNUM *g);
+    BIGNUM *g);
 void ossl_ffc_params_get0_pqg(const FFC_PARAMS *params, const BIGNUM **p,
-                              const BIGNUM **q, const BIGNUM **g);
+    const BIGNUM **q, const BIGNUM **g);
 void ossl_ffc_params_set0_j(FFC_PARAMS *d, BIGNUM *j);
 int ossl_ffc_params_set_seed(FFC_PARAMS *params,
-                             const unsigned char *seed, size_t seedlen);
+    const unsigned char *seed, size_t seedlen);
 void ossl_ffc_params_set_gindex(FFC_PARAMS *params, int index);
 void ossl_ffc_params_set_pcounter(FFC_PARAMS *params, int index);
 void ossl_ffc_params_set_h(FFC_PARAMS *params, int index);
 void ossl_ffc_params_set_flags(FFC_PARAMS *params, unsigned int flags);
 void ossl_ffc_params_enable_flags(FFC_PARAMS *params, unsigned int flags,
-                                  int enable);
+    int enable);
 int ossl_ffc_set_digest(FFC_PARAMS *params, const char *alg, const char *props);
 
 int ossl_ffc_params_set_validate_params(FFC_PARAMS *params,
-                                        const unsigned char *seed,
-                                        size_t seedlen, int counter);
+    const unsigned char *seed,
+    size_t seedlen, int counter);
 void ossl_ffc_params_get_validate_params(const FFC_PARAMS *params,
-                                         unsigned char **seed, size_t *seedlen,
-                                         int *pcounter);
+    unsigned char **seed, size_t *seedlen,
+    int *pcounter);
 
 int ossl_ffc_params_copy(FFC_PARAMS *dst, const FFC_PARAMS *src);
 int ossl_ffc_params_cmp(const FFC_PARAMS *a, const FFC_PARAMS *b, int ignore_q);
@@ -153,53 +153,52 @@ int ossl_ffc_params_cmp(const FFC_PARAMS *a, const FFC_PARAMS *b, int ignore_q);
 int ossl_ffc_params_print(BIO *bp, const FFC_PARAMS *ffc, int indent);
 #endif /* FIPS_MODULE */
 
-
 int ossl_ffc_params_FIPS186_4_generate(OSSL_LIB_CTX *libctx, FFC_PARAMS *params,
-                                       int type, size_t L, size_t N,
-                                       int *res, BN_GENCB *cb);
+    int type, size_t L, size_t N,
+    int *res, BN_GENCB *cb);
 int ossl_ffc_params_FIPS186_2_generate(OSSL_LIB_CTX *libctx, FFC_PARAMS *params,
-                                       int type, size_t L, size_t N,
-                                       int *res, BN_GENCB *cb);
+    int type, size_t L, size_t N,
+    int *res, BN_GENCB *cb);
 
 int ossl_ffc_params_FIPS186_4_gen_verify(OSSL_LIB_CTX *libctx,
-                                         FFC_PARAMS *params, int mode, int type,
-                                         size_t L, size_t N, int *res,
-                                         BN_GENCB *cb);
+    FFC_PARAMS *params, int mode, int type,
+    size_t L, size_t N, int *res,
+    BN_GENCB *cb);
 int ossl_ffc_params_FIPS186_2_gen_verify(OSSL_LIB_CTX *libctx,
-                                         FFC_PARAMS *params, int mode, int type,
-                                         size_t L, size_t N, int *res,
-                                         BN_GENCB *cb);
+    FFC_PARAMS *params, int mode, int type,
+    size_t L, size_t N, int *res,
+    BN_GENCB *cb);
 
 int ossl_ffc_params_simple_validate(OSSL_LIB_CTX *libctx,
-                                    const FFC_PARAMS *params,
-                                    int paramstype, int *res);
+    const FFC_PARAMS *params,
+    int paramstype, int *res);
 int ossl_ffc_params_full_validate(OSSL_LIB_CTX *libctx,
-                                  const FFC_PARAMS *params,
-                                  int paramstype, int *res);
+    const FFC_PARAMS *params,
+    int paramstype, int *res);
 int ossl_ffc_params_FIPS186_4_validate(OSSL_LIB_CTX *libctx,
-                                       const FFC_PARAMS *params,
-                                       int type, int *res, BN_GENCB *cb);
+    const FFC_PARAMS *params,
+    int type, int *res, BN_GENCB *cb);
 int ossl_ffc_params_FIPS186_2_validate(OSSL_LIB_CTX *libctx,
-                                       const FFC_PARAMS *params,
-                                       int type, int *res, BN_GENCB *cb);
+    const FFC_PARAMS *params,
+    int type, int *res, BN_GENCB *cb);
 
 int ossl_ffc_generate_private_key(BN_CTX *ctx, const FFC_PARAMS *params,
-                                  int N, int s, BIGNUM *priv);
+    int N, int s, BIGNUM *priv);
 
 int ossl_ffc_params_validate_unverifiable_g(BN_CTX *ctx, BN_MONT_CTX *mont,
-                                            const BIGNUM *p, const BIGNUM *q,
-                                            const BIGNUM *g, BIGNUM *tmp,
-                                            int *ret);
+    const BIGNUM *p, const BIGNUM *q,
+    const BIGNUM *g, BIGNUM *tmp,
+    int *ret);
 
 int ossl_ffc_validate_public_key(const FFC_PARAMS *params,
-                                 const BIGNUM *pub_key, int *ret);
+    const BIGNUM *pub_key, int *ret);
 int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params,
-                                         const BIGNUM *pub_key, int *ret);
+    const BIGNUM *pub_key, int *ret);
 int ossl_ffc_validate_private_key(const BIGNUM *upper, const BIGNUM *priv_key,
-                                 int *ret);
+    int *ret);
 
 int ossl_ffc_params_todata(const FFC_PARAMS *ffc, OSSL_PARAM_BLD *tmpl,
-                           OSSL_PARAM params[]);
+    OSSL_PARAM params[]);
 int ossl_ffc_params_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[]);
 
 typedef struct dh_named_group_st DH_NAMED_GROUP;
@@ -207,8 +206,8 @@ const DH_NAMED_GROUP *ossl_ffc_name_to_dh_named_group(const char *name);
 const DH_NAMED_GROUP *ossl_ffc_uid_to_dh_named_group(int uid);
 #ifndef OPENSSL_NO_DH
 const DH_NAMED_GROUP *ossl_ffc_numbers_to_dh_named_group(const BIGNUM *p,
-                                                         const BIGNUM *q,
-                                                         const BIGNUM *g);
+    const BIGNUM *q,
+    const BIGNUM *g);
 #endif
 int ossl_ffc_named_group_get_uid(const DH_NAMED_GROUP *group);
 const char *ossl_ffc_named_group_get_name(const DH_NAMED_GROUP *);
diff --git a/include/internal/ktls.h b/include/internal/ktls.h
index 95492fd0659f..72eb36f6ee97 100644
--- a/include/internal/ktls.h
+++ b/include/internal/ktls.h
@@ -8,38 +8,38 @@
  */
 
 #if defined(OPENSSL_SYS_LINUX)
-# ifndef OPENSSL_NO_KTLS
-#  include <linux/version.h>
-#  if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
-#   define OPENSSL_NO_KTLS
-#   ifndef PEDANTIC
-#    warning "KTLS requires Kernel Headers >= 4.13.0"
-#    warning "Skipping Compilation of KTLS"
-#   endif
-#  endif
-# endif
+#ifndef OPENSSL_NO_KTLS
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
+#define OPENSSL_NO_KTLS
+#ifndef PEDANTIC
+#warning "KTLS requires Kernel Headers >= 4.13.0"
+#warning "Skipping Compilation of KTLS"
+#endif
+#endif
+#endif
 #endif
 
 #ifndef HEADER_INTERNAL_KTLS
-# define HEADER_INTERNAL_KTLS
-# pragma once
+#define HEADER_INTERNAL_KTLS
+#pragma once
 
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
 
-#  if defined(__FreeBSD__)
-#   include <sys/types.h>
-#   include <sys/socket.h>
-#   include <sys/ktls.h>
-#   include <netinet/in.h>
-#   include <netinet/tcp.h>
-#   include <openssl/ssl3.h>
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ktls.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <openssl/ssl3.h>
 
-#   ifndef TCP_RXTLS_ENABLE
-#    define OPENSSL_NO_KTLS_RX
-#   endif
-#   define OPENSSL_KTLS_AES_GCM_128
-#   define OPENSSL_KTLS_AES_GCM_256
-#   define OPENSSL_KTLS_TLS13
+#ifndef TCP_RXTLS_ENABLE
+#define OPENSSL_NO_KTLS_RX
+#endif
+#define OPENSSL_KTLS_AES_GCM_128
+#define OPENSSL_KTLS_AES_GCM_256
+#define OPENSSL_KTLS_TLS13
 
 typedef struct tls_enable ktls_crypto_info_t;
 
@@ -66,13 +66,17 @@ static ossl_inline int ktls_start(int fd, ktls_crypto_info_t *tls_en, int is_tx)
 {
     if (is_tx)
         return setsockopt(fd, IPPROTO_TCP, TCP_TXTLS_ENABLE,
-                          tls_en, sizeof(*tls_en)) ? 0 : 1;
-#   ifndef OPENSSL_NO_KTLS_RX
+                   tls_en, sizeof(*tls_en))
+            ? 0
+            : 1;
+#ifndef OPENSSL_NO_KTLS_RX
     return setsockopt(fd, IPPROTO_TCP, TCP_RXTLS_ENABLE, tls_en,
-                      sizeof(*tls_en)) ? 0 : 1;
-#   else
+               sizeof(*tls_en))
+        ? 0
+        : 1;
+#else
     return 0;
-#   endif
+#endif
 }
 
 /*
@@ -83,13 +87,13 @@ static ossl_inline int ktls_start(int fd, ktls_crypto_info_t *tls_en, int is_tx)
  * record using this control message.
  */
 static ossl_inline int ktls_send_ctrl_message(int fd, unsigned char record_type,
-                                              const void *data, size_t length)
+    const void *data, size_t length)
 {
     struct msghdr msg = { 0 };
     int cmsg_len = sizeof(record_type);
     struct cmsghdr *cmsg;
     char buf[CMSG_SPACE(cmsg_len)];
-    struct iovec msg_iov;   /* Vector of data to send/receive into */
+    struct iovec msg_iov; /* Vector of data to send/receive into */
 
     msg.msg_control = buf;
     msg.msg_controllen = sizeof(buf);
@@ -108,14 +112,14 @@ static ossl_inline int ktls_send_ctrl_message(int fd, unsigned char record_type,
     return sendmsg(fd, &msg, 0);
 }
 
-#   ifdef OPENSSL_NO_KTLS_RX
+#ifdef OPENSSL_NO_KTLS_RX
 
 static ossl_inline int ktls_read_record(int fd, void *data, size_t length)
 {
     return -1;
 }
 
-#   else /* !defined(OPENSSL_NO_KTLS_RX) */
+#else /* !defined(OPENSSL_NO_KTLS_RX) */
 
 /*
  * Receive a TLS record using the tls_en provided in ktls_start.  The
@@ -131,7 +135,7 @@ static ossl_inline int ktls_read_record(int fd, void *data, size_t length)
     struct tls_get_record *tgr;
     struct cmsghdr *cmsg;
     char buf[CMSG_SPACE(cmsg_len)];
-    struct iovec msg_iov;   /* Vector of data to send/receive into */
+    struct iovec msg_iov; /* Vector of data to send/receive into */
     int ret;
     unsigned char *p = data;
     const size_t prepend_length = SSL3_RT_HEADER_LENGTH;
@@ -174,19 +178,20 @@ static ossl_inline int ktls_read_record(int fd, void *data, size_t length)
     p[0] = tgr->tls_type;
     p[1] = tgr->tls_vmajor;
     p[2] = tgr->tls_vminor;
-    *(uint16_t *)(p + 3) = htons(ret);
+    p[3] = (ret >> 8) & 0xff;
+    p[4] = ret & 0xff;
 
     return ret + prepend_length;
 }
 
-#   endif /* OPENSSL_NO_KTLS_RX */
+#endif /* OPENSSL_NO_KTLS_RX */
 
 /*
  * KTLS enables the sendfile system call to send data from a file over
  * TLS.
  */
 static ossl_inline ossl_ssize_t ktls_sendfile(int s, int fd, off_t off,
-                                              size_t size, int flags)
+    size_t size, int flags)
 {
     off_t sbytes = 0;
     int ret;
@@ -197,65 +202,65 @@ static ossl_inline ossl_ssize_t ktls_sendfile(int s, int fd, off_t off,
     return sbytes;
 }
 
-#  endif                         /* __FreeBSD__ */
+#endif /* __FreeBSD__ */
 
-#  if defined(OPENSSL_SYS_LINUX)
+#if defined(OPENSSL_SYS_LINUX)
 
-#   include <linux/tls.h>
-#   if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
-#    define OPENSSL_NO_KTLS_RX
-#    ifndef PEDANTIC
-#     warning "KTLS requires Kernel Headers >= 4.17.0 for receiving"
-#     warning "Skipping Compilation of KTLS receive data path"
-#    endif
-#   endif
-#   define OPENSSL_KTLS_AES_GCM_128
-#   if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
-#    define OPENSSL_KTLS_AES_GCM_256
-#    define OPENSSL_KTLS_TLS13
-#    if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)
-#     define OPENSSL_KTLS_AES_CCM_128
-#     if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
-#      ifndef OPENSSL_NO_CHACHA
-#       define OPENSSL_KTLS_CHACHA20_POLY1305
-#      endif
-#     endif
-#    endif
-#   endif
+#include <linux/tls.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
+#define OPENSSL_NO_KTLS_RX
+#ifndef PEDANTIC
+#warning "KTLS requires Kernel Headers >= 4.17.0 for receiving"
+#warning "Skipping Compilation of KTLS receive data path"
+#endif
+#endif
+#define OPENSSL_KTLS_AES_GCM_128
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
+#define OPENSSL_KTLS_AES_GCM_256
+#define OPENSSL_KTLS_TLS13
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)
+#define OPENSSL_KTLS_AES_CCM_128
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
+#ifndef OPENSSL_NO_CHACHA
+#define OPENSSL_KTLS_CHACHA20_POLY1305
+#endif
+#endif
+#endif
+#endif
 
-#   include <sys/sendfile.h>
-#   include <netinet/tcp.h>
-#   include <linux/socket.h>
-#   include <openssl/ssl3.h>
-#   include <openssl/tls1.h>
-#   include <openssl/evp.h>
+#include <sys/sendfile.h>
+#include <netinet/tcp.h>
+#include <linux/socket.h>
+#include <openssl/ssl3.h>
+#include <openssl/tls1.h>
+#include <openssl/evp.h>
 
-#   ifndef SOL_TLS
-#    define SOL_TLS 282
-#   endif
+#ifndef SOL_TLS
+#define SOL_TLS 282
+#endif
 
-#   ifndef TCP_ULP
-#    define TCP_ULP 31
-#   endif
+#ifndef TCP_ULP
+#define TCP_ULP 31
+#endif
 
-#   ifndef TLS_RX
-#    define TLS_RX                  2
-#   endif
+#ifndef TLS_RX
+#define TLS_RX 2
+#endif
 
 struct tls_crypto_info_all {
     union {
-#   ifdef OPENSSL_KTLS_AES_GCM_128
+#ifdef OPENSSL_KTLS_AES_GCM_128
         struct tls12_crypto_info_aes_gcm_128 gcm128;
-#   endif
-#   ifdef OPENSSL_KTLS_AES_GCM_256
+#endif
+#ifdef OPENSSL_KTLS_AES_GCM_256
         struct tls12_crypto_info_aes_gcm_256 gcm256;
-#   endif
-#   ifdef OPENSSL_KTLS_AES_CCM_128
+#endif
+#ifdef OPENSSL_KTLS_AES_CCM_128
         struct tls12_crypto_info_aes_ccm_128 ccm128;
-#   endif
-#   ifdef OPENSSL_KTLS_CHACHA20_POLY1305
+#endif
+#ifdef OPENSSL_KTLS_CHACHA20_POLY1305
         struct tls12_crypto_info_chacha20_poly1305 chacha20poly1305;
-#   endif
+#endif
     };
     size_t tls_crypto_info_len;
 };
@@ -282,10 +287,18 @@ static ossl_inline int ktls_enable(int fd)
  * authenticated and decapsulated using the crypto_info provided here.
  */
 static ossl_inline int ktls_start(int fd, ktls_crypto_info_t *crypto_info,
-                                  int is_tx)
+    int is_tx)
 {
+    /*
+     * Socket must be in TCP established state to enable KTLS.
+     * Further calls to enable ktls will return EEXIST
+     */
+    ktls_enable(fd);
+
     return setsockopt(fd, SOL_TLS, is_tx ? TLS_TX : TLS_RX,
-                      crypto_info, crypto_info->tls_crypto_info_len) ? 0 : 1;
+               crypto_info, crypto_info->tls_crypto_info_len)
+        ? 0
+        : 1;
 }
 
 /*
@@ -296,7 +309,7 @@ static ossl_inline int ktls_start(int fd, ktls_crypto_info_t *crypto_info,
  * record using this control message.
  */
 static ossl_inline int ktls_send_ctrl_message(int fd, unsigned char record_type,
-                                              const void *data, size_t length)
+    const void *data, size_t length)
 {
     struct msghdr msg;
     int cmsg_len = sizeof(record_type);
@@ -305,7 +318,7 @@ static ossl_inline int ktls_send_ctrl_message(int fd, unsigned char record_type,
         struct cmsghdr hdr;
         char buf[CMSG_SPACE(sizeof(unsigned char))];
     } cmsgbuf;
-    struct iovec msg_iov;       /* Vector of data to send/receive into */
+    struct iovec msg_iov; /* Vector of data to send/receive into */
 
     memset(&msg, 0, sizeof(msg));
     msg.msg_control = cmsgbuf.buf;
@@ -334,15 +347,14 @@ static ossl_inline ossl_ssize_t ktls_sendfile(int s, int fd, off_t off, size_t s
     return sendfile(s, fd, &off, size);
 }
 
-#   ifdef OPENSSL_NO_KTLS_RX
-
+#ifdef OPENSSL_NO_KTLS_RX
 
 static ossl_inline int ktls_read_record(int fd, void *data, size_t length)
 {
     return -1;
 }
 
-#   else /* !defined(OPENSSL_NO_KTLS_RX) */
+#else /* !defined(OPENSSL_NO_KTLS_RX) */
 
 /*
  * Receive a TLS record using the crypto_info provided in ktls_start.
@@ -397,8 +409,8 @@ static ossl_inline int ktls_read_record(int fd, void *data, size_t length)
     return ret;
 }
 
-#   endif /* OPENSSL_NO_KTLS_RX */
+#endif /* OPENSSL_NO_KTLS_RX */
 
-#  endif /* OPENSSL_SYS_LINUX */
-# endif /* OPENSSL_NO_KTLS */
+#endif /* OPENSSL_SYS_LINUX */
+#endif /* OPENSSL_NO_KTLS */
 #endif /* HEADER_INTERNAL_KTLS */
diff --git a/include/internal/namemap.h b/include/internal/namemap.h
index a4c60ae695c9..bc0d7edacc7f 100644
--- a/include/internal/namemap.h
+++ b/include/internal/namemap.h
@@ -19,7 +19,7 @@ int ossl_namemap_empty(OSSL_NAMEMAP *namemap);
 
 int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number, const char *name);
 int ossl_namemap_add_name_n(OSSL_NAMEMAP *namemap, int number,
-                            const char *name, size_t name_len);
+    const char *name, size_t name_len);
 
 /*
  * The number<->name relationship is 1<->many
@@ -28,16 +28,16 @@ int ossl_namemap_add_name_n(OSSL_NAMEMAP *namemap, int number,
  */
 int ossl_namemap_name2num(const OSSL_NAMEMAP *namemap, const char *name);
 int ossl_namemap_name2num_n(const OSSL_NAMEMAP *namemap,
-                            const char *name, size_t name_len);
+    const char *name, size_t name_len);
 const char *ossl_namemap_num2name(const OSSL_NAMEMAP *namemap, int number,
-                                  size_t idx);
+    size_t idx);
 int ossl_namemap_doall_names(const OSSL_NAMEMAP *namemap, int number,
-                             void (*fn)(const char *name, void *data),
-                             void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 
 /*
  * A utility that handles several names in a string, divided by a given
  * separator.
  */
 int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
-                           const char *names, const char separator);
+    const char *names, const char separator);
diff --git a/include/internal/nelem.h b/include/internal/nelem.h
index b758513b4cae..d0b2c39596ec 100644
--- a/include/internal/nelem.h
+++ b/include/internal/nelem.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_INTERNAL_NELEM_H
-# define OSSL_INTERNAL_NELEM_H
-# pragma once
+#define OSSL_INTERNAL_NELEM_H
+#pragma once
 
-# define OSSL_NELEM(x)    (sizeof(x)/sizeof((x)[0]))
+#define OSSL_NELEM(x) (sizeof(x) / sizeof((x)[0]))
 #endif
diff --git a/include/internal/numbers.h b/include/internal/numbers.h
index 4f4d3306d5da..77330fa8bbc6 100644
--- a/include/internal/numbers.h
+++ b/include/internal/numbers.h
@@ -8,78 +8,77 @@
  */
 
 #ifndef OSSL_INTERNAL_NUMBERS_H
-# define OSSL_INTERNAL_NUMBERS_H
-# pragma once
+#define OSSL_INTERNAL_NUMBERS_H
+#pragma once
 
-# include <limits.h>
+#include <limits.h>
 
-# if (-1 & 3) == 0x03           /* Two's complement */
+#if (-1 & 3) == 0x03 /* Two's complement */
 
-#  define __MAXUINT__(T) ((T) -1)
-#  define __MAXINT__(T) ((T) ((((T) 1) << ((sizeof(T) * CHAR_BIT) - 1)) ^ __MAXUINT__(T)))
-#  define __MININT__(T) (-__MAXINT__(T) - 1)
+#define __MAXUINT__(T) ((T) - 1)
+#define __MAXINT__(T) ((T)((((T)1) << ((sizeof(T) * CHAR_BIT) - 1)) ^ __MAXUINT__(T)))
+#define __MININT__(T) (-__MAXINT__(T) - 1)
 
-# elif (-1 & 3) == 0x02         /* One's complement */
+#elif (-1 & 3) == 0x02 /* One's complement */
 
-#  define __MAXUINT__(T) (((T) -1) + 1)
-#  define __MAXINT__(T) ((T) ((((T) 1) << ((sizeof(T) * CHAR_BIT) - 1)) ^ __MAXUINT__(T)))
-#  define __MININT__(T) (-__MAXINT__(T))
+#define __MAXUINT__(T) (((T) - 1) + 1)
+#define __MAXINT__(T) ((T)((((T)1) << ((sizeof(T) * CHAR_BIT) - 1)) ^ __MAXUINT__(T)))
+#define __MININT__(T) (-__MAXINT__(T))
 
-# elif (-1 & 3) == 0x01         /* Sign/magnitude */
+#elif (-1 & 3) == 0x01 /* Sign/magnitude */
 
-#  define __MAXINT__(T) ((T) (((((T) 1) << ((sizeof(T) * CHAR_BIT) - 2)) - 1) | (((T) 1) << ((sizeof(T) * CHAR_BIT) - 2))))
-#  define __MAXUINT__(T) ((T) (__MAXINT__(T) | (((T) 1) << ((sizeof(T) * CHAR_BIT) - 1))))
-#  define __MININT__(T) (-__MAXINT__(T))
+#define __MAXINT__(T) ((T)(((((T)1) << ((sizeof(T) * CHAR_BIT) - 2)) - 1) | (((T)1) << ((sizeof(T) * CHAR_BIT) - 2))))
+#define __MAXUINT__(T) ((T)(__MAXINT__(T) | (((T)1) << ((sizeof(T) * CHAR_BIT) - 1))))
+#define __MININT__(T) (-__MAXINT__(T))
 
-# else
+#else
 
-#  error "do not know the integer encoding on this architecture"
+#error "do not know the integer encoding on this architecture"
 
-# endif
+#endif
 
-# ifndef INT8_MAX
-#  define INT8_MIN __MININT__(int8_t)
-#  define INT8_MAX __MAXINT__(int8_t)
-#  define UINT8_MAX __MAXUINT__(uint8_t)
-# endif
+#ifndef INT8_MAX
+#define INT8_MIN __MININT__(int8_t)
+#define INT8_MAX __MAXINT__(int8_t)
+#define UINT8_MAX __MAXUINT__(uint8_t)
+#endif
 
-# ifndef INT16_MAX
-#  define INT16_MIN __MININT__(int16_t)
-#  define INT16_MAX __MAXINT__(int16_t)
-#  define UINT16_MAX __MAXUINT__(uint16_t)
-# endif
+#ifndef INT16_MAX
+#define INT16_MIN __MININT__(int16_t)
+#define INT16_MAX __MAXINT__(int16_t)
+#define UINT16_MAX __MAXUINT__(uint16_t)
+#endif
 
-# ifndef INT32_MAX
-#  define INT32_MIN __MININT__(int32_t)
-#  define INT32_MAX __MAXINT__(int32_t)
-#  define UINT32_MAX __MAXUINT__(uint32_t)
-# endif
+#ifndef INT32_MAX
+#define INT32_MIN __MININT__(int32_t)
+#define INT32_MAX __MAXINT__(int32_t)
+#define UINT32_MAX __MAXUINT__(uint32_t)
+#endif
 
-# ifndef INT64_MAX
-#  define INT64_MIN __MININT__(int64_t)
-#  define INT64_MAX __MAXINT__(int64_t)
-#  define UINT64_MAX __MAXUINT__(uint64_t)
-# endif
+#ifndef INT64_MAX
+#define INT64_MIN __MININT__(int64_t)
+#define INT64_MAX __MAXINT__(int64_t)
+#define UINT64_MAX __MAXUINT__(uint64_t)
+#endif
 
-# ifndef INT128_MAX
-#  if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__ == 16
+#ifndef INT128_MAX
+#if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__ == 16
 typedef __int128_t int128_t;
 typedef __uint128_t uint128_t;
-#   define INT128_MIN __MININT__(int128_t)
-#   define INT128_MAX __MAXINT__(int128_t)
-#   define UINT128_MAX __MAXUINT__(uint128_t)
-#  endif
-# endif
-
-# ifndef SIZE_MAX
-#  define SIZE_MAX __MAXUINT__(size_t)
-# endif
+#define INT128_MIN __MININT__(int128_t)
+#define INT128_MAX __MAXINT__(int128_t)
+#define UINT128_MAX __MAXUINT__(uint128_t)
+#endif
+#endif
 
-# ifndef OSSL_INTMAX_MAX
-#  define OSSL_INTMAX_MIN __MININT__(ossl_intmax_t)
-#  define OSSL_INTMAX_MAX __MAXINT__(ossl_intmax_t)
-#  define OSSL_UINTMAX_MAX __MAXUINT__(ossl_uintmax_t)
-# endif
+#ifndef SIZE_MAX
+#define SIZE_MAX __MAXUINT__(size_t)
+#endif
 
+#ifndef OSSL_INTMAX_MAX
+#define OSSL_INTMAX_MIN __MININT__(ossl_intmax_t)
+#define OSSL_INTMAX_MAX __MAXINT__(ossl_intmax_t)
+#define OSSL_UINTMAX_MAX __MAXUINT__(ossl_uintmax_t)
 #endif
 
+#endif
diff --git a/include/internal/o_dir.h b/include/internal/o_dir.h
index add34d14be11..d715a5dd3fe3 100644
--- a/include/internal/o_dir.h
+++ b/include/internal/o_dir.h
@@ -37,8 +37,8 @@
  */
 
 #ifndef OSSL_INTERNAL_O_DIR_H
-# define OSSL_INTERNAL_O_DIR_H
-# pragma once
+#define OSSL_INTERNAL_O_DIR_H
+#pragma once
 
 typedef struct OPENSSL_dir_context_st OPENSSL_DIR_CTX;
 
@@ -50,4 +50,4 @@ const char *OPENSSL_DIR_read(OPENSSL_DIR_CTX **ctx, const char *directory);
 /* returns 1 on success, 0 on error */
 int OPENSSL_DIR_end(OPENSSL_DIR_CTX **ctx);
 
-#endif                          /* LPDIR_H */
+#endif /* LPDIR_H */
diff --git a/include/internal/packet.h b/include/internal/packet.h
index ed76172078a4..1a84ae058924 100644
--- a/include/internal/packet.h
+++ b/include/internal/packet.h
@@ -8,16 +8,16 @@
  */
 
 #ifndef OSSL_INTERNAL_PACKET_H
-# define OSSL_INTERNAL_PACKET_H
-# pragma once
+#define OSSL_INTERNAL_PACKET_H
+#pragma once
 
-# include <string.h>
-# include <openssl/bn.h>
-# include <openssl/buffer.h>
-# include <openssl/crypto.h>
-# include <openssl/e_os2.h>
+#include <string.h>
+#include <openssl/bn.h>
+#include <openssl/buffer.h>
+#include <openssl/crypto.h>
+#include <openssl/e_os2.h>
 
-# include "internal/numbers.h"
+#include "internal/numbers.h"
 
 typedef struct {
     /* Pointer to where we are currently reading from */
@@ -67,8 +67,8 @@ static ossl_inline const unsigned char *PACKET_data(const PACKET *pkt)
  * is being used.
  */
 __owur static ossl_inline int PACKET_buf_init(PACKET *pkt,
-                                              const unsigned char *buf,
-                                              size_t len)
+    const unsigned char *buf,
+    size_t len)
 {
     /* Sanity check for negative values. */
     if (len > (size_t)(SIZE_MAX / 2))
@@ -92,7 +92,7 @@ static ossl_inline void PACKET_null_init(PACKET *pkt)
  * If lengths are equal, performs the comparison in constant time.
  */
 __owur static ossl_inline int PACKET_equal(const PACKET *pkt, const void *ptr,
-                                           size_t num)
+    size_t num)
 {
     if (PACKET_remaining(pkt) != num)
         return 0;
@@ -105,7 +105,7 @@ __owur static ossl_inline int PACKET_equal(const PACKET *pkt, const void *ptr,
  * the original |pkt|, so data wrapped by |pkt| must outlive the |subpkt|.
  */
 __owur static ossl_inline int PACKET_peek_sub_packet(const PACKET *pkt,
-                                                     PACKET *subpkt, size_t len)
+    PACKET *subpkt, size_t len)
 {
     if (PACKET_remaining(pkt) < len)
         return 0;
@@ -119,7 +119,7 @@ __owur static ossl_inline int PACKET_peek_sub_packet(const PACKET *pkt,
  * original |pkt|, so data wrapped by |pkt| must outlive the |subpkt|.
  */
 __owur static ossl_inline int PACKET_get_sub_packet(PACKET *pkt,
-                                                    PACKET *subpkt, size_t len)
+    PACKET *subpkt, size_t len)
 {
     if (!PACKET_peek_sub_packet(pkt, subpkt, len))
         return 0;
@@ -134,7 +134,7 @@ __owur static ossl_inline int PACKET_get_sub_packet(PACKET *pkt,
  * |*data|
  */
 __owur static ossl_inline int PACKET_peek_net_2(const PACKET *pkt,
-                                                unsigned int *data)
+    unsigned int *data)
 {
     if (PACKET_remaining(pkt) < 2)
         return 0;
@@ -174,7 +174,7 @@ __owur static ossl_inline int PACKET_get_net_2_len(PACKET *pkt, size_t *data)
  * |*data|
  */
 __owur static ossl_inline int PACKET_peek_net_3(const PACKET *pkt,
-                                                unsigned long *data)
+    unsigned long *data)
 {
     if (PACKET_remaining(pkt) < 3)
         return 0;
@@ -215,7 +215,7 @@ __owur static ossl_inline int PACKET_get_net_3_len(PACKET *pkt, size_t *data)
  * |*data|
  */
 __owur static ossl_inline int PACKET_peek_net_4(const PACKET *pkt,
-                                                unsigned long *data)
+    unsigned long *data)
 {
     if (PACKET_remaining(pkt) < 4)
         return 0;
@@ -233,7 +233,7 @@ __owur static ossl_inline int PACKET_peek_net_4(const PACKET *pkt,
  * |*data|
  */
 __owur static ossl_inline int PACKET_peek_net_8(const PACKET *pkt,
-                                                uint64_t *data)
+    uint64_t *data)
 {
     if (PACKET_remaining(pkt) < 8)
         return 0;
@@ -287,7 +287,7 @@ __owur static ossl_inline int PACKET_get_net_8(PACKET *pkt, uint64_t *data)
 
 /* Peek ahead at 1 byte from |pkt| and store the value in |*data| */
 __owur static ossl_inline int PACKET_peek_1(const PACKET *pkt,
-                                            unsigned int *data)
+    unsigned int *data)
 {
     if (!PACKET_remaining(pkt))
         return 0;
@@ -325,7 +325,7 @@ __owur static ossl_inline int PACKET_get_1_len(PACKET *pkt, size_t *data)
  * in |*data|
  */
 __owur static ossl_inline int PACKET_peek_4(const PACKET *pkt,
-                                            unsigned long *data)
+    unsigned long *data)
 {
     if (PACKET_remaining(pkt) < 4)
         return 0;
@@ -360,8 +360,8 @@ __owur static ossl_inline int PACKET_get_4(PACKET *pkt, unsigned long *data)
  * underlying buffer gets freed
  */
 __owur static ossl_inline int PACKET_peek_bytes(const PACKET *pkt,
-                                                const unsigned char **data,
-                                                size_t len)
+    const unsigned char **data,
+    size_t len)
 {
     if (PACKET_remaining(pkt) < len)
         return 0;
@@ -378,8 +378,8 @@ __owur static ossl_inline int PACKET_peek_bytes(const PACKET *pkt,
  * freed
  */
 __owur static ossl_inline int PACKET_get_bytes(PACKET *pkt,
-                                               const unsigned char **data,
-                                               size_t len)
+    const unsigned char **data,
+    size_t len)
 {
     if (!PACKET_peek_bytes(pkt, data, len))
         return 0;
@@ -391,8 +391,8 @@ __owur static ossl_inline int PACKET_get_bytes(PACKET *pkt,
 
 /* Peek ahead at |len| bytes from |pkt| and copy them to |data| */
 __owur static ossl_inline int PACKET_peek_copy_bytes(const PACKET *pkt,
-                                                     unsigned char *data,
-                                                     size_t len)
+    unsigned char *data,
+    size_t len)
 {
     if (PACKET_remaining(pkt) < len)
         return 0;
@@ -407,7 +407,7 @@ __owur static ossl_inline int PACKET_peek_copy_bytes(const PACKET *pkt,
  * The caller is responsible for ensuring that |data| can hold |len| bytes.
  */
 __owur static ossl_inline int PACKET_copy_bytes(PACKET *pkt,
-                                                unsigned char *data, size_t len)
+    unsigned char *data, size_t len)
 {
     if (!PACKET_peek_copy_bytes(pkt, data, len))
         return 0;
@@ -425,8 +425,8 @@ __owur static ossl_inline int PACKET_copy_bytes(PACKET *pkt,
  * done with a given PACKET).
  */
 __owur static ossl_inline int PACKET_copy_all(const PACKET *pkt,
-                                              unsigned char *dest,
-                                              size_t dest_len, size_t *len)
+    unsigned char *dest,
+    size_t dest_len, size_t *len)
 {
     if (PACKET_remaining(pkt) > dest_len) {
         *len = 0;
@@ -447,7 +447,7 @@ __owur static ossl_inline int PACKET_copy_all(const PACKET *pkt,
  * done with a given PACKET).
  */
 __owur static ossl_inline int PACKET_memdup(const PACKET *pkt,
-                                            unsigned char **data, size_t *len)
+    unsigned char **data, size_t *len)
 {
     size_t length;
 
@@ -512,13 +512,12 @@ __owur static ossl_inline int PACKET_forward(PACKET *pkt, size_t len)
  * Upon failure, the original |pkt| and |subpkt| are not modified.
  */
 __owur static ossl_inline int PACKET_get_length_prefixed_1(PACKET *pkt,
-                                                           PACKET *subpkt)
+    PACKET *subpkt)
 {
     unsigned int length;
     const unsigned char *data;
     PACKET tmp = *pkt;
-    if (!PACKET_get_1(&tmp, &length) ||
-        !PACKET_get_bytes(&tmp, &data, (size_t)length)) {
+    if (!PACKET_get_1(&tmp, &length) || !PACKET_get_bytes(&tmp, &data, (size_t)length)) {
         return 0;
     }
 
@@ -534,14 +533,12 @@ __owur static ossl_inline int PACKET_get_length_prefixed_1(PACKET *pkt,
  * leftover bytes in |pkt|.
  */
 __owur static ossl_inline int PACKET_as_length_prefixed_1(PACKET *pkt,
-                                                          PACKET *subpkt)
+    PACKET *subpkt)
 {
     unsigned int length;
     const unsigned char *data;
     PACKET tmp = *pkt;
-    if (!PACKET_get_1(&tmp, &length) ||
-        !PACKET_get_bytes(&tmp, &data, (size_t)length) ||
-        PACKET_remaining(&tmp) != 0) {
+    if (!PACKET_get_1(&tmp, &length) || !PACKET_get_bytes(&tmp, &data, (size_t)length) || PACKET_remaining(&tmp) != 0) {
         return 0;
     }
 
@@ -560,14 +557,13 @@ __owur static ossl_inline int PACKET_as_length_prefixed_1(PACKET *pkt,
  * Upon failure, the original |pkt| and |subpkt| are not modified.
  */
 __owur static ossl_inline int PACKET_get_length_prefixed_2(PACKET *pkt,
-                                                           PACKET *subpkt)
+    PACKET *subpkt)
 {
     unsigned int length;
     const unsigned char *data;
     PACKET tmp = *pkt;
 
-    if (!PACKET_get_net_2(&tmp, &length) ||
-        !PACKET_get_bytes(&tmp, &data, (size_t)length)) {
+    if (!PACKET_get_net_2(&tmp, &length) || !PACKET_get_bytes(&tmp, &data, (size_t)length)) {
         return 0;
     }
 
@@ -583,15 +579,13 @@ __owur static ossl_inline int PACKET_get_length_prefixed_2(PACKET *pkt,
  * leftover bytes in |pkt|.
  */
 __owur static ossl_inline int PACKET_as_length_prefixed_2(PACKET *pkt,
-                                                          PACKET *subpkt)
+    PACKET *subpkt)
 {
     unsigned int length;
     const unsigned char *data;
     PACKET tmp = *pkt;
 
-    if (!PACKET_get_net_2(&tmp, &length) ||
-        !PACKET_get_bytes(&tmp, &data, (size_t)length) ||
-        PACKET_remaining(&tmp) != 0) {
+    if (!PACKET_get_net_2(&tmp, &length) || !PACKET_get_bytes(&tmp, &data, (size_t)length) || PACKET_remaining(&tmp) != 0) {
         return 0;
     }
 
@@ -610,13 +604,12 @@ __owur static ossl_inline int PACKET_as_length_prefixed_2(PACKET *pkt,
  * Upon failure, the original |pkt| and |subpkt| are not modified.
  */
 __owur static ossl_inline int PACKET_get_length_prefixed_3(PACKET *pkt,
-                                                           PACKET *subpkt)
+    PACKET *subpkt)
 {
     unsigned long length;
     const unsigned char *data;
     PACKET tmp = *pkt;
-    if (!PACKET_get_net_3(&tmp, &length) ||
-        !PACKET_get_bytes(&tmp, &data, (size_t)length)) {
+    if (!PACKET_get_net_3(&tmp, &length) || !PACKET_get_bytes(&tmp, &data, (size_t)length)) {
         return 0;
     }
 
@@ -680,17 +673,16 @@ struct wpacket_st {
 /* Flags */
 
 /* Default */
-#define WPACKET_FLAGS_NONE                      0
+#define WPACKET_FLAGS_NONE 0
 
 /* Error on WPACKET_close() if no data written to the WPACKET */
-#define WPACKET_FLAGS_NON_ZERO_LENGTH           1
+#define WPACKET_FLAGS_NON_ZERO_LENGTH 1
 
 /*
  * Abandon all changes on WPACKET_close() if no data written to the WPACKET,
  * i.e. this does not write out a zero packet length
  */
-#define WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH    2
-
+#define WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH 2
 
 /*
  * Initialise a WPACKET with the buffer in |buf|. The buffer must exist
@@ -725,7 +717,7 @@ int WPACKET_init_null_der(WPACKET *pkt);
  * occur if you attempt to write beyond the end of the buffer
  */
 int WPACKET_init_static_len(WPACKET *pkt, unsigned char *buf, size_t len,
-                            size_t lenbytes);
+    size_t lenbytes);
 
 /*
  * Same as WPACKET_init_static_len except lenbytes is always 0, and we set the
@@ -797,7 +789,7 @@ int WPACKET_start_sub_packet(WPACKET *pkt);
  * change its location.
  */
 int WPACKET_allocate_bytes(WPACKET *pkt, size_t len,
-                           unsigned char **allocbytes);
+    unsigned char **allocbytes);
 
 /*
  * The same as WPACKET_allocate_bytes() except additionally a new sub-packet is
@@ -806,7 +798,7 @@ int WPACKET_allocate_bytes(WPACKET *pkt, size_t len,
  * directly. Use the convenience macros below instead.
  */
 int WPACKET_sub_allocate_bytes__(WPACKET *pkt, size_t len,
-                                 unsigned char **allocbytes, size_t lenbytes);
+    unsigned char **allocbytes, size_t lenbytes);
 
 /*
  * Convenience macros for calling WPACKET_sub_allocate_bytes with different
@@ -845,7 +837,7 @@ int WPACKET_reserve_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes);
  * The "reserve_bytes" equivalent of WPACKET_sub_allocate_bytes__()
  */
 int WPACKET_sub_reserve_bytes__(WPACKET *pkt, size_t len,
-                                 unsigned char **allocbytes, size_t lenbytes);
+    unsigned char **allocbytes, size_t lenbytes);
 
 /*
  * Convenience macros for  WPACKET_sub_reserve_bytes with different lengths
@@ -898,7 +890,7 @@ int WPACKET_memset(WPACKET *pkt, int ch, size_t len);
  * directly. Use the convenience macros below instead.
  */
 int WPACKET_sub_memcpy__(WPACKET *pkt, const void *src, size_t len,
-                       size_t lenbytes);
+    size_t lenbytes);
 
 /* Convenience macros for calling WPACKET_sub_memcpy with different lengths */
 #define WPACKET_sub_memcpy_u8(pkt, src, len) \
@@ -934,4 +926,4 @@ int WPACKET_is_null_buf(WPACKET *pkt);
 /* Release resources in a WPACKET if a failure has occurred. */
 void WPACKET_cleanup(WPACKET *pkt);
 
-#endif                          /* OSSL_INTERNAL_PACKET_H */
+#endif /* OSSL_INTERNAL_PACKET_H */
diff --git a/include/internal/param_build_set.h b/include/internal/param_build_set.h
index 126211b7f298..332cc371b156 100644
--- a/include/internal/param_build_set.h
+++ b/include/internal/param_build_set.h
@@ -8,39 +8,39 @@
  */
 
 #ifndef OSSL_INTERNAL_PARAM_BUILD_SET_H
-# define OSSL_INTERNAL_PARAM_BUILD_SET_H
-# pragma once
+#define OSSL_INTERNAL_PARAM_BUILD_SET_H
+#pragma once
 
-# include <openssl/safestack.h>
-# include <openssl/param_build.h>
-# include "internal/cryptlib.h"
+#include <openssl/safestack.h>
+#include <openssl/param_build.h>
+#include "internal/cryptlib.h"
 
 typedef union {
     OSSL_UNION_ALIGN;
 } OSSL_PARAM_ALIGNED_BLOCK;
 
-# define OSSL_PARAM_ALIGN_SIZE  sizeof(OSSL_PARAM_ALIGNED_BLOCK)
+#define OSSL_PARAM_ALIGN_SIZE sizeof(OSSL_PARAM_ALIGNED_BLOCK)
 
 size_t ossl_param_bytes_to_blocks(size_t bytes);
 void ossl_param_set_secure_block(OSSL_PARAM *last, void *secure_buffer,
-                                 size_t secure_buffer_sz);
+    size_t secure_buffer_sz);
 
 int ossl_param_build_set_int(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
-                             const char *key, int num);
+    const char *key, int num);
 int ossl_param_build_set_long(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
-                              const char *key, long num);
+    const char *key, long num);
 int ossl_param_build_set_utf8_string(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
-                                     const char *key, const char *buf);
+    const char *key, const char *buf);
 int ossl_param_build_set_octet_string(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
-                                      const char *key,
-                                      const unsigned char *data,
-                                      size_t data_len);
+    const char *key,
+    const unsigned char *data,
+    size_t data_len);
 int ossl_param_build_set_bn(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
-                            const char *key, const BIGNUM *bn);
+    const char *key, const BIGNUM *bn);
 int ossl_param_build_set_bn_pad(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
-                                const char *key, const BIGNUM *bn,  size_t sz);
+    const char *key, const BIGNUM *bn, size_t sz);
 int ossl_param_build_set_multi_key_bn(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
-                                      const char *names[],
-                                      STACK_OF(BIGNUM_const) *stk);
+    const char *names[],
+    STACK_OF(BIGNUM_const) *stk);
 
-#endif  /* OSSL_INTERNAL_PARAM_BUILD_SET_H */
+#endif /* OSSL_INTERNAL_PARAM_BUILD_SET_H */
diff --git a/include/internal/passphrase.h b/include/internal/passphrase.h
index 54d997b0d90b..803622867b73 100644
--- a/include/internal/passphrase.h
+++ b/include/internal/passphrase.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_INTERNAL_PASSPHRASE_H
-# define OSSL_INTERNAL_PASSPHRASE_H
-# pragma once
+#define OSSL_INTERNAL_PASSPHRASE_H
+#pragma once
 
 /*
  * This is a passphrase reader bridge with bells and whistles.
@@ -41,9 +41,9 @@
 struct ossl_passphrase_data_st {
     enum {
         is_expl_passphrase = 1, /* Explicit passphrase given by user */
-        is_pem_password,        /* pem_password_cb given by user */
-        is_ossl_passphrase,     /* OSSL_PASSPHRASE_CALLBACK given by user */
-        is_ui_method            /* UI_METHOD given by user */
+        is_pem_password, /* pem_password_cb given by user */
+        is_ossl_passphrase, /* OSSL_PASSPHRASE_CALLBACK given by user */
+        is_ui_method /* UI_METHOD given by user */
     } type;
     union {
         struct {
@@ -72,7 +72,7 @@ struct ossl_passphrase_data_st {
      */
 
     /* Set to indicate that caching should be done */
-    unsigned int flag_cache_passphrase:1;
+    unsigned int flag_cache_passphrase : 1;
 
     /*-
      * Misc section: caches and other
@@ -88,14 +88,14 @@ void ossl_pw_clear_passphrase_data(struct ossl_passphrase_data_st *data);
 void ossl_pw_clear_passphrase_cache(struct ossl_passphrase_data_st *data);
 
 int ossl_pw_set_passphrase(struct ossl_passphrase_data_st *data,
-                           const unsigned char *passphrase,
-                           size_t passphrase_len);
+    const unsigned char *passphrase,
+    size_t passphrase_len);
 int ossl_pw_set_pem_password_cb(struct ossl_passphrase_data_st *data,
-                                pem_password_cb *cb, void *cbarg);
+    pem_password_cb *cb, void *cbarg);
 int ossl_pw_set_ossl_passphrase_cb(struct ossl_passphrase_data_st *data,
-                                   OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg);
+    OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg);
 int ossl_pw_set_ui_method(struct ossl_passphrase_data_st *data,
-                          const UI_METHOD *ui_method, void *ui_data);
+    const UI_METHOD *ui_method, void *ui_data);
 
 int ossl_pw_enable_passphrase_caching(struct ossl_passphrase_data_st *data);
 int ossl_pw_disable_passphrase_caching(struct ossl_passphrase_data_st *data);
@@ -103,8 +103,8 @@ int ossl_pw_disable_passphrase_caching(struct ossl_passphrase_data_st *data);
 /* Central function for direct calls */
 
 int ossl_pw_get_passphrase(char *pass, size_t pass_size, size_t *pass_len,
-                           const OSSL_PARAM params[], int verify,
-                           struct ossl_passphrase_data_st *data);
+    const OSSL_PARAM params[], int verify,
+    struct ossl_passphrase_data_st *data);
 
 /* Callback functions */
 
diff --git a/include/internal/property.h b/include/internal/property.h
index d09274d0c92c..a0bd58374129 100644
--- a/include/internal/property.h
+++ b/include/internal/property.h
@@ -9,16 +9,17 @@
  */
 
 #ifndef OSSL_INTERNAL_PROPERTY_H
-# define OSSL_INTERNAL_PROPERTY_H
-# pragma once
+#define OSSL_INTERNAL_PROPERTY_H
+#pragma once
 
-# include "internal/cryptlib.h"
+#include "internal/cryptlib.h"
 
 typedef struct ossl_method_store_st OSSL_METHOD_STORE;
 typedef struct ossl_property_list_st OSSL_PROPERTY_LIST;
 
 typedef enum {
-    OSSL_PROPERTY_TYPE_STRING, OSSL_PROPERTY_TYPE_NUMBER,
+    OSSL_PROPERTY_TYPE_STRING,
+    OSSL_PROPERTY_TYPE_NUMBER,
     OSSL_PROPERTY_TYPE_VALUE_UNDEFINED
 } OSSL_PROPERTY_TYPE;
 typedef struct ossl_property_definition_st OSSL_PROPERTY_DEFINITION;
@@ -30,25 +31,24 @@ int ossl_property_parse_init(OSSL_LIB_CTX *ctx);
 OSSL_PROPERTY_LIST *ossl_parse_property(OSSL_LIB_CTX *ctx, const char *defn);
 /* Property query parser */
 OSSL_PROPERTY_LIST *ossl_parse_query(OSSL_LIB_CTX *ctx, const char *s,
-                                     int create_values);
+    int create_values);
 /* Property checker of query vs definition */
 int ossl_property_match_count(const OSSL_PROPERTY_LIST *query,
-                              const OSSL_PROPERTY_LIST *defn);
-int ossl_property_is_enabled(OSSL_LIB_CTX *ctx,  const char *property_name,
-                             const OSSL_PROPERTY_LIST *prop_list);
+    const OSSL_PROPERTY_LIST *defn);
+int ossl_property_is_enabled(OSSL_LIB_CTX *ctx, const char *property_name,
+    const OSSL_PROPERTY_LIST *prop_list);
 /* Free a parsed property list */
 void ossl_property_free(OSSL_PROPERTY_LIST *p);
 
 /* Get a property from a property list */
 const OSSL_PROPERTY_DEFINITION *
 ossl_property_find_property(const OSSL_PROPERTY_LIST *list,
-                            OSSL_LIB_CTX *libctx, const char *name);
+    OSSL_LIB_CTX *libctx, const char *name);
 OSSL_PROPERTY_TYPE ossl_property_get_type(const OSSL_PROPERTY_DEFINITION *prop);
 const char *ossl_property_get_string_value(OSSL_LIB_CTX *libctx,
-                                           const OSSL_PROPERTY_DEFINITION *prop);
+    const OSSL_PROPERTY_DEFINITION *prop);
 int64_t ossl_property_get_number_value(const OSSL_PROPERTY_DEFINITION *prop);
 
-
 /* Implementation store functions */
 OSSL_METHOD_STORE *ossl_method_store_new(OSSL_LIB_CTX *ctx);
 void ossl_method_store_free(OSSL_METHOD_STORE *store);
@@ -57,41 +57,41 @@ int ossl_method_lock_store(OSSL_METHOD_STORE *store);
 int ossl_method_unlock_store(OSSL_METHOD_STORE *store);
 
 int ossl_method_store_add(OSSL_METHOD_STORE *store, const OSSL_PROVIDER *prov,
-                          int nid, const char *properties, void *method,
-                          int (*method_up_ref)(void *),
-                          void (*method_destruct)(void *));
+    int nid, const char *properties, void *method,
+    int (*method_up_ref)(void *),
+    void (*method_destruct)(void *));
 int ossl_method_store_remove(OSSL_METHOD_STORE *store, int nid,
-                             const void *method);
+    const void *method);
 void ossl_method_store_do_all(OSSL_METHOD_STORE *store,
-                              void (*fn)(int id, void *method, void *fnarg),
-                              void *fnarg);
+    void (*fn)(int id, void *method, void *fnarg),
+    void *fnarg);
 int ossl_method_store_fetch(OSSL_METHOD_STORE *store,
-                            int nid, const char *prop_query,
-                            const OSSL_PROVIDER **prov, void **method);
+    int nid, const char *prop_query,
+    const OSSL_PROVIDER **prov, void **method);
 int ossl_method_store_remove_all_provided(OSSL_METHOD_STORE *store,
-                                          const OSSL_PROVIDER *prov);
+    const OSSL_PROVIDER *prov);
 
 /* Get the global properties associate with the specified library context */
 OSSL_PROPERTY_LIST **ossl_ctx_global_properties(OSSL_LIB_CTX *ctx,
-                                                int loadconfig);
+    int loadconfig);
 
 /* property query cache functions */
 int ossl_method_store_cache_get(OSSL_METHOD_STORE *store, OSSL_PROVIDER *prov,
-                                int nid, const char *prop_query, void **result);
+    int nid, const char *prop_query, void **result);
 int ossl_method_store_cache_set(OSSL_METHOD_STORE *store, OSSL_PROVIDER *prov,
-                                int nid, const char *prop_query, void *result,
-                                int (*method_up_ref)(void *),
-                                void (*method_destruct)(void *));
+    int nid, const char *prop_query, void *result,
+    int (*method_up_ref)(void *),
+    void (*method_destruct)(void *));
 
 __owur int ossl_method_store_cache_flush_all(OSSL_METHOD_STORE *store);
 
 /* Merge two property queries together */
 OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a,
-                                        const OSSL_PROPERTY_LIST *b);
+    const OSSL_PROPERTY_LIST *b);
 
 size_t ossl_property_list_to_string(OSSL_LIB_CTX *ctx,
-                                    const OSSL_PROPERTY_LIST *list, char *buf,
-                                    size_t bufsize);
+    const OSSL_PROPERTY_LIST *list, char *buf,
+    size_t bufsize);
 
 int ossl_global_properties_no_mirrored(OSSL_LIB_CTX *libctx);
 void ossl_global_properties_stop_mirroring(OSSL_LIB_CTX *libctx);
diff --git a/include/internal/propertyerr.h b/include/internal/propertyerr.h
index fbee53f11e84..94e2c90955d7 100644
--- a/include/internal/propertyerr.h
+++ b/include/internal/propertyerr.h
@@ -9,35 +9,34 @@
  */
 
 #ifndef OSSL_INTERNAL_PROPERTYERR_H
-# define OSSL_INTERNAL_PROPERTYERR_H
-# pragma once
+#define OSSL_INTERNAL_PROPERTYERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 int ossl_err_load_PROP_strings(void);
 
 /*
  * PROP reason codes.
  */
-# define PROP_R_NAME_TOO_LONG                             100
-# define PROP_R_NOT_AN_ASCII_CHARACTER                    101
-# define PROP_R_NOT_AN_HEXADECIMAL_DIGIT                  102
-# define PROP_R_NOT_AN_IDENTIFIER                         103
-# define PROP_R_NOT_AN_OCTAL_DIGIT                        104
-# define PROP_R_NOT_A_DECIMAL_DIGIT                       105
-# define PROP_R_NO_MATCHING_STRING_DELIMITER              106
-# define PROP_R_NO_VALUE                                  107
-# define PROP_R_PARSE_FAILED                              108
-# define PROP_R_STRING_TOO_LONG                           109
-# define PROP_R_TRAILING_CHARACTERS                       110
-
+#define PROP_R_NAME_TOO_LONG 100
+#define PROP_R_NOT_AN_ASCII_CHARACTER 101
+#define PROP_R_NOT_AN_HEXADECIMAL_DIGIT 102
+#define PROP_R_NOT_AN_IDENTIFIER 103
+#define PROP_R_NOT_AN_OCTAL_DIGIT 104
+#define PROP_R_NOT_A_DECIMAL_DIGIT 105
+#define PROP_R_NO_MATCHING_STRING_DELIMITER 106
+#define PROP_R_NO_VALUE 107
+#define PROP_R_PARSE_FAILED 108
+#define PROP_R_STRING_TOO_LONG 109
+#define PROP_R_TRAILING_CHARACTERS 110
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/internal/provider.h b/include/internal/provider.h
index a0d9b8f8682d..dc3f9a16958b 100644
--- a/include/internal/provider.h
+++ b/include/internal/provider.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef OSSL_INTERNAL_PROVIDER_H
-# define OSSL_INTERNAL_PROVIDER_H
-# pragma once
+#define OSSL_INTERNAL_PROVIDER_H
+#pragma once
 
-# include <openssl/core.h>
-# include <openssl/core_dispatch.h>
-# include "internal/dso.h"
-# include "internal/symhacks.h"
+#include <openssl/core.h>
+#include <openssl/core_dispatch.h>
+#include "internal/dso.h"
+#include "internal/symhacks.h"
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /*
  * namespaces:
@@ -29,10 +29,10 @@ extern "C" {
 
 /* Provider Object finder, constructor and destructor */
 OSSL_PROVIDER *ossl_provider_find(OSSL_LIB_CTX *libctx, const char *name,
-                                  int noconfig);
+    int noconfig);
 OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name,
-                                 OSSL_provider_init_fn *init_function,
-                                 int noconfig);
+    OSSL_provider_init_fn *init_function,
+    int noconfig);
 int ossl_provider_up_ref(OSSL_PROVIDER *prov);
 void ossl_provider_free(OSSL_PROVIDER *prov);
 
@@ -40,7 +40,7 @@ void ossl_provider_free(OSSL_PROVIDER *prov);
 int ossl_provider_set_fallback(OSSL_PROVIDER *prov);
 int ossl_provider_set_module_path(OSSL_PROVIDER *prov, const char *module_path);
 int ossl_provider_add_parameter(OSSL_PROVIDER *prov, const char *name,
-                                const char *value);
+    const char *value);
 
 int ossl_provider_is_child(const OSSL_PROVIDER *prov);
 int ossl_provider_set_child(OSSL_PROVIDER *prov, const OSSL_CORE_HANDLE *handle);
@@ -59,16 +59,16 @@ int ossl_provider_disable_fallback_loading(OSSL_LIB_CTX *libctx);
 int ossl_provider_activate(OSSL_PROVIDER *prov, int upcalls, int aschild);
 int ossl_provider_deactivate(OSSL_PROVIDER *prov, int removechildren);
 int ossl_provider_add_to_store(OSSL_PROVIDER *prov, OSSL_PROVIDER **actualprov,
-                               int retain_fallbacks);
+    int retain_fallbacks);
 
 /* Return pointer to the provider's context */
 void *ossl_provider_ctx(const OSSL_PROVIDER *prov);
 
 /* Iterate over all loaded providers */
 int ossl_provider_doall_activated(OSSL_LIB_CTX *,
-                                  int (*cb)(OSSL_PROVIDER *provider,
-                                            void *cbdata),
-                                  void *cbdata);
+    int (*cb)(OSSL_PROVIDER *provider,
+        void *cbdata),
+    void *cbdata);
 
 /* Getters for other library functions */
 const char *ossl_provider_name(const OSSL_PROVIDER *prov);
@@ -84,16 +84,16 @@ void ossl_provider_teardown(const OSSL_PROVIDER *prov);
 const OSSL_PARAM *ossl_provider_gettable_params(const OSSL_PROVIDER *prov);
 int ossl_provider_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[]);
 int ossl_provider_get_capabilities(const OSSL_PROVIDER *prov,
-                                   const char *capability,
-                                   OSSL_CALLBACK *cb,
-                                   void *arg);
+    const char *capability,
+    OSSL_CALLBACK *cb,
+    void *arg);
 int ossl_provider_self_test(const OSSL_PROVIDER *prov);
 const OSSL_ALGORITHM *ossl_provider_query_operation(const OSSL_PROVIDER *prov,
-                                                    int operation_id,
-                                                    int *no_cache);
+    int operation_id,
+    int *no_cache);
 void ossl_provider_unquery_operation(const OSSL_PROVIDER *prov,
-                                     int operation_id,
-                                     const OSSL_ALGORITHM *algs);
+    int operation_id,
+    const OSSL_ALGORITHM *algs);
 
 /*
  * Cache of bits to see if we already added methods for an operation in
@@ -102,19 +102,19 @@ void ossl_provider_unquery_operation(const OSSL_PROVIDER *prov,
  */
 int ossl_provider_set_operation_bit(OSSL_PROVIDER *provider, size_t bitnum);
 int ossl_provider_test_operation_bit(OSSL_PROVIDER *provider, size_t bitnum,
-                                     int *result);
+    int *result);
 
 /* Configuration */
 void ossl_provider_add_conf_module(void);
 
 /* Child providers */
 int ossl_provider_init_as_child(OSSL_LIB_CTX *ctx,
-                                const OSSL_CORE_HANDLE *handle,
-                                const OSSL_DISPATCH *in);
+    const OSSL_CORE_HANDLE *handle,
+    const OSSL_DISPATCH *in);
 void ossl_provider_deinit_child(OSSL_LIB_CTX *ctx);
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/internal/refcount.h b/include/internal/refcount.h
index 64fb77fba58f..121e36bc57ca 100644
--- a/include/internal/refcount.h
+++ b/include/internal/refcount.h
@@ -7,28 +7,28 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_INTERNAL_REFCOUNT_H
-# define OSSL_INTERNAL_REFCOUNT_H
-# pragma once
+#define OSSL_INTERNAL_REFCOUNT_H
+#pragma once
 
-# include <openssl/e_os2.h>
-# include <openssl/trace.h>
+#include <openssl/e_os2.h>
+#include <openssl/trace.h>
 
-# if defined(OPENSSL_THREADS) && !defined(OPENSSL_DEV_NO_ATOMICS)
-#  if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
-      && !defined(__STDC_NO_ATOMICS__)
-#   include <stdatomic.h>
-#   define HAVE_C11_ATOMICS
-#  endif
+#if defined(OPENSSL_THREADS) && !defined(OPENSSL_DEV_NO_ATOMICS)
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
+    && !defined(__STDC_NO_ATOMICS__)
+#include <stdatomic.h>
+#define HAVE_C11_ATOMICS
+#endif
 
-#  if defined(HAVE_C11_ATOMICS) && defined(ATOMIC_INT_LOCK_FREE) \
-      && ATOMIC_INT_LOCK_FREE > 0
+#if defined(HAVE_C11_ATOMICS) && defined(ATOMIC_INT_LOCK_FREE) \
+    && ATOMIC_INT_LOCK_FREE > 0
 
-#   define HAVE_ATOMICS 1
+#define HAVE_ATOMICS 1
 
 typedef _Atomic int CRYPTO_REF_COUNT;
 
 static inline int CRYPTO_UP_REF(_Atomic int *val, int *ret,
-                                ossl_unused void *lock)
+    ossl_unused void *lock)
 {
     *ret = atomic_fetch_add_explicit(val, 1, memory_order_relaxed) + 1;
     return 1;
@@ -45,7 +45,7 @@ static inline int CRYPTO_UP_REF(_Atomic int *val, int *ret,
  * otherwise imply an acquire fence. Hence conditional acquire fence...
  */
 static inline int CRYPTO_DOWN_REF(_Atomic int *val, int *ret,
-                                  ossl_unused void *lock)
+    ossl_unused void *lock)
 {
     *ret = atomic_fetch_sub_explicit(val, 1, memory_order_relaxed) - 1;
     if (*ret == 0)
@@ -53,9 +53,9 @@ static inline int CRYPTO_DOWN_REF(_Atomic int *val, int *ret,
     return 1;
 }
 
-#  elif defined(__GNUC__) && defined(__ATOMIC_RELAXED) && __GCC_ATOMIC_INT_LOCK_FREE > 0
+#elif defined(__GNUC__) && defined(__ATOMIC_RELAXED) && __GCC_ATOMIC_INT_LOCK_FREE > 0
 
-#   define HAVE_ATOMICS 1
+#define HAVE_ATOMICS 1
 
 typedef int CRYPTO_REF_COUNT;
 
@@ -66,113 +66,113 @@ static __inline__ int CRYPTO_UP_REF(int *val, int *ret, ossl_unused void *lock)
 }
 
 static __inline__ int CRYPTO_DOWN_REF(int *val, int *ret,
-                                      ossl_unused void *lock)
+    ossl_unused void *lock)
 {
     *ret = __atomic_fetch_sub(val, 1, __ATOMIC_RELAXED) - 1;
     if (*ret == 0)
         __atomic_thread_fence(__ATOMIC_ACQUIRE);
     return 1;
 }
-#  elif defined(__ICL) && defined(_WIN32)
-#   define HAVE_ATOMICS 1
+#elif defined(__ICL) && defined(_WIN32)
+#define HAVE_ATOMICS 1
 typedef volatile int CRYPTO_REF_COUNT;
 
 static __inline int CRYPTO_UP_REF(volatile int *val, int *ret,
-                                  ossl_unused void *lock)
+    ossl_unused void *lock)
 {
     *ret = _InterlockedExchangeAdd((void *)val, 1) + 1;
     return 1;
 }
 
 static __inline int CRYPTO_DOWN_REF(volatile int *val, int *ret,
-                                    ossl_unused void *lock)
+    ossl_unused void *lock)
 {
     *ret = _InterlockedExchangeAdd((void *)val, -1) - 1;
     return 1;
 }
 
-#  elif defined(_MSC_VER) && _MSC_VER>=1200
+#elif defined(_MSC_VER) && _MSC_VER >= 1200
 
-#   define HAVE_ATOMICS 1
+#define HAVE_ATOMICS 1
 
 typedef volatile int CRYPTO_REF_COUNT;
 
-#   if (defined(_M_ARM) && _M_ARM>=7 && !defined(_WIN32_WCE)) || defined(_M_ARM64)
-#    include <intrin.h>
-#    if defined(_M_ARM64) && !defined(_ARM_BARRIER_ISH)
-#     define _ARM_BARRIER_ISH _ARM64_BARRIER_ISH
-#    endif
+#if (defined(_M_ARM) && _M_ARM >= 7 && !defined(_WIN32_WCE)) || defined(_M_ARM64)
+#include <intrin.h>
+#if defined(_M_ARM64) && !defined(_ARM_BARRIER_ISH)
+#define _ARM_BARRIER_ISH _ARM64_BARRIER_ISH
+#endif
 
 static __inline int CRYPTO_UP_REF(volatile int *val, int *ret,
-                                  ossl_unused void *lock)
+    ossl_unused void *lock)
 {
     *ret = _InterlockedExchangeAdd_nf(val, 1) + 1;
     return 1;
 }
 
 static __inline int CRYPTO_DOWN_REF(volatile int *val, int *ret,
-                                    ossl_unused void *lock)
+    ossl_unused void *lock)
 {
     *ret = _InterlockedExchangeAdd_nf(val, -1) - 1;
     if (*ret == 0)
         __dmb(_ARM_BARRIER_ISH);
     return 1;
 }
-#   else
-#    if !defined(_WIN32_WCE)
-#     pragma intrinsic(_InterlockedExchangeAdd)
-#    else
-#     if _WIN32_WCE >= 0x600
-       extern long __cdecl _InterlockedExchangeAdd(long volatile*, long);
-#     else
-       /* under Windows CE we still have old-style Interlocked* functions */
-       extern long __cdecl InterlockedExchangeAdd(long volatile*, long);
-#      define _InterlockedExchangeAdd InterlockedExchangeAdd
-#     endif
-#    endif
+#else
+#if !defined(_WIN32_WCE)
+#pragma intrinsic(_InterlockedExchangeAdd)
+#else
+#if _WIN32_WCE >= 0x600
+extern long __cdecl _InterlockedExchangeAdd(long volatile *, long);
+#else
+/* under Windows CE we still have old-style Interlocked* functions */
+extern long __cdecl InterlockedExchangeAdd(long volatile *, long);
+#define _InterlockedExchangeAdd InterlockedExchangeAdd
+#endif
+#endif
 
 static __inline int CRYPTO_UP_REF(volatile int *val, int *ret,
-                                  ossl_unused void *lock)
+    ossl_unused void *lock)
 {
     *ret = _InterlockedExchangeAdd((long volatile *)val, 1) + 1;
     return 1;
 }
 
 static __inline int CRYPTO_DOWN_REF(volatile int *val, int *ret,
-                                    ossl_unused void *lock)
+    ossl_unused void *lock)
 {
     *ret = _InterlockedExchangeAdd((long volatile *)val, -1) - 1;
     return 1;
 }
-#   endif
+#endif
 
-#  endif
-# endif  /* !OPENSSL_DEV_NO_ATOMICS */
+#endif
+#endif /* !OPENSSL_DEV_NO_ATOMICS */
 
 /*
  * All the refcounting implementations above define HAVE_ATOMICS, so if it's
  * still undefined here (such as when OPENSSL_DEV_NO_ATOMICS is defined), it
  * means we need to implement a fallback.  This fallback uses locks.
  */
-# ifndef HAVE_ATOMICS
+#ifndef HAVE_ATOMICS
 
 typedef int CRYPTO_REF_COUNT;
 
-# define CRYPTO_UP_REF(val, ret, lock) CRYPTO_atomic_add(val, 1, ret, lock)
-# define CRYPTO_DOWN_REF(val, ret, lock) CRYPTO_atomic_add(val, -1, ret, lock)
+#define CRYPTO_UP_REF(val, ret, lock) CRYPTO_atomic_add(val, 1, ret, lock)
+#define CRYPTO_DOWN_REF(val, ret, lock) CRYPTO_atomic_add(val, -1, ret, lock)
 
-# endif
+#endif
 
-# if !defined(NDEBUG) && !defined(OPENSSL_NO_STDIO)
-#  define REF_ASSERT_ISNT(test) \
+#if !defined(NDEBUG) && !defined(OPENSSL_NO_STDIO)
+#define REF_ASSERT_ISNT(test) \
     (void)((test) ? (OPENSSL_die("refcount error", __FILE__, __LINE__), 1) : 0)
-# else
-#  define REF_ASSERT_ISNT(i)
-# endif
+#else
+#define REF_ASSERT_ISNT(i)
+#endif
 
-# define REF_PRINT_EX(text, count, object) \
+#define REF_PRINT_EX(text, count, object) \
     OSSL_TRACE3(REF_COUNT, "%p:%4d:%s\n", (object), (count), (text));
-# define REF_PRINT_COUNT(text, object) \
+#define REF_PRINT_COUNT(text, object) \
     REF_PRINT_EX(text, object->references, (void *)object)
 
 #endif
diff --git a/include/internal/sha3.h b/include/internal/sha3.h
index 80ad86e58e3e..cfaec62fcec4 100644
--- a/include/internal/sha3.h
+++ b/include/internal/sha3.h
@@ -9,33 +9,32 @@
 
 /* This header can move into provider when legacy support is removed */
 #ifndef OSSL_INTERNAL_SHA3_H
-# define OSSL_INTERNAL_SHA3_H
-# pragma once
+#define OSSL_INTERNAL_SHA3_H
+#pragma once
 
-# include <openssl/e_os2.h>
-# include <stddef.h>
+#include <openssl/e_os2.h>
+#include <stddef.h>
 
-# define KECCAK1600_WIDTH 1600
-# define SHA3_MDSIZE(bitlen)    (bitlen / 8)
-# define KMAC_MDSIZE(bitlen)    2 * (bitlen / 8)
-# define SHA3_BLOCKSIZE(bitlen) (KECCAK1600_WIDTH - bitlen * 2) / 8
+#define KECCAK1600_WIDTH 1600
+#define SHA3_MDSIZE(bitlen) (bitlen / 8)
+#define KMAC_MDSIZE(bitlen) 2 * (bitlen / 8)
+#define SHA3_BLOCKSIZE(bitlen) (KECCAK1600_WIDTH - bitlen * 2) / 8
 
 typedef struct keccak_st KECCAK1600_CTX;
 
-typedef size_t (sha3_absorb_fn)(void *vctx, const void *inp, size_t len);
-typedef int (sha3_final_fn)(unsigned char *md, void *vctx);
+typedef size_t(sha3_absorb_fn)(void *vctx, const void *inp, size_t len);
+typedef int(sha3_final_fn)(unsigned char *md, void *vctx);
 
-typedef struct prov_sha3_meth_st
-{
+typedef struct prov_sha3_meth_st {
     sha3_absorb_fn *absorb;
     sha3_final_fn *final;
 } PROV_SHA3_METHOD;
 
 struct keccak_st {
     uint64_t A[5][5];
-    size_t block_size;          /* cached ctx->digest->block_size */
-    size_t md_size;             /* output length, variable in XOF */
-    size_t bufsz;               /* used bytes in below buffer */
+    size_t block_size; /* cached ctx->digest->block_size */
+    size_t md_size; /* output length, variable in XOF */
+    size_t bufsz; /* used bytes in below buffer */
     unsigned char buf[KECCAK1600_WIDTH / 8 - 32];
     unsigned char pad;
     PROV_SHA3_METHOD meth;
@@ -44,11 +43,11 @@ struct keccak_st {
 void ossl_sha3_reset(KECCAK1600_CTX *ctx);
 int ossl_sha3_init(KECCAK1600_CTX *ctx, unsigned char pad, size_t bitlen);
 int ossl_keccak_kmac_init(KECCAK1600_CTX *ctx, unsigned char pad,
-                          size_t bitlen);
+    size_t bitlen);
 int ossl_sha3_update(KECCAK1600_CTX *ctx, const void *_inp, size_t len);
 int ossl_sha3_final(unsigned char *md, KECCAK1600_CTX *ctx);
 
 size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
-                   size_t r);
+    size_t r);
 
 #endif /* OSSL_INTERNAL_SHA3_H */
diff --git a/include/internal/sizes.h b/include/internal/sizes.h
index f6496c818265..d6f655eec32d 100644
--- a/include/internal/sizes.h
+++ b/include/internal/sizes.h
@@ -8,15 +8,15 @@
  */
 
 #ifndef OSSL_INTERNAL_SIZES_H
-# define OSSL_INTERNAL_SIZES_H
-# pragma once
+#define OSSL_INTERNAL_SIZES_H
+#pragma once
 
 /*
  * Max sizes used to allocate buffers with a fixed sizes, for example for
  * stack allocations, structure fields, ...
  */
-# define OSSL_MAX_NAME_SIZE           50 /* Algorithm name */
-# define OSSL_MAX_PROPQUERY_SIZE     256 /* Property query strings */
-# define OSSL_MAX_ALGORITHM_ID_SIZE  256 /* AlgorithmIdentifier DER */
+#define OSSL_MAX_NAME_SIZE 50 /* Algorithm name */
+#define OSSL_MAX_PROPQUERY_SIZE 256 /* Property query strings */
+#define OSSL_MAX_ALGORITHM_ID_SIZE 256 /* AlgorithmIdentifier DER */
 
 #endif
diff --git a/include/internal/sm3.h b/include/internal/sm3.h
index db1d61f0523c..32a05ae9ef71 100644
--- a/include/internal/sm3.h
+++ b/include/internal/sm3.h
@@ -10,26 +10,26 @@
 
 /* This header can move into provider when legacy support is removed */
 #ifndef OSSL_INTERNAL_SM3_H
-# define OSSL_INTERNAL_SM3_H
-# pragma once
+#define OSSL_INTERNAL_SM3_H
+#pragma once
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifdef OPENSSL_NO_SM3
-#  error SM3 is disabled.
-# endif
+#ifdef OPENSSL_NO_SM3
+#error SM3 is disabled.
+#endif
 
-# define SM3_DIGEST_LENGTH 32
-# define SM3_WORD unsigned int
+#define SM3_DIGEST_LENGTH 32
+#define SM3_WORD unsigned int
 
-# define SM3_CBLOCK      64
-# define SM3_LBLOCK      (SM3_CBLOCK/4)
+#define SM3_CBLOCK 64
+#define SM3_LBLOCK (SM3_CBLOCK / 4)
 
 typedef struct SM3state_st {
-   SM3_WORD A, B, C, D, E, F, G, H;
-   SM3_WORD Nl, Nh;
-   SM3_WORD data[SM3_LBLOCK];
-   unsigned int num;
+    SM3_WORD A, B, C, D, E, F, G, H;
+    SM3_WORD Nl, Nh;
+    SM3_WORD data[SM3_LBLOCK];
+    unsigned int num;
 } SM3_CTX;
 
 int ossl_sm3_init(SM3_CTX *c);
diff --git a/include/internal/sockets.h b/include/internal/sockets.h
index 1876af8fafec..273d2a525283 100644
--- a/include/internal/sockets.h
+++ b/include/internal/sockets.h
@@ -8,48 +8,48 @@
  */
 
 #ifndef OSSL_INTERNAL_SOCKETS_H
-# define OSSL_INTERNAL_SOCKETS_H
-# pragma once
+#define OSSL_INTERNAL_SOCKETS_H
+#pragma once
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
-#  define NO_SYS_PARAM_H
-# endif
-# ifdef WIN32
-#  define NO_SYS_UN_H
-# endif
-# ifdef OPENSSL_SYS_VMS
-#  define NO_SYS_PARAM_H
-#  define NO_SYS_UN_H
-# endif
+#if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
+#define NO_SYS_PARAM_H
+#endif
+#ifdef WIN32
+#define NO_SYS_UN_H
+#endif
+#ifdef OPENSSL_SYS_VMS
+#define NO_SYS_PARAM_H
+#define NO_SYS_UN_H
+#endif
 
-# ifdef OPENSSL_NO_SOCK
+#ifdef OPENSSL_NO_SOCK
 
-# elif defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
-#  if defined(__DJGPP__)
-#   define WATT32
-#   define WATT32_NO_OLDIES
-#   include <sys/socket.h>
-#   include <sys/un.h>
-#   include <tcp.h>
-#   include <netdb.h>
-#   include <arpa/inet.h>
-#   include <netinet/tcp.h>
-#  elif defined(_WIN32_WCE) && _WIN32_WCE<410
-#   define getservbyname _masked_declaration_getservbyname
-#  endif
-#  if !defined(IPPROTO_IP)
-    /* winsock[2].h was included already? */
-#   include <winsock.h>
-#  endif
-#  ifdef getservbyname
-     /* this is used to be wcecompat/include/winsock_extras.h */
-#   undef getservbyname
+#elif defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
+#if defined(__DJGPP__)
+#define WATT32
+#define WATT32_NO_OLDIES
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <tcp.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <netinet/tcp.h>
+#elif defined(_WIN32_WCE) && _WIN32_WCE < 410
+#define getservbyname _masked_declaration_getservbyname
+#endif
+#if !defined(IPPROTO_IP)
+/* winsock[2].h was included already? */
+#include <winsock.h>
+#endif
+#ifdef getservbyname
+/* this is used to be wcecompat/include/winsock_extras.h */
+#undef getservbyname
 struct servent *PASCAL getservbyname(const char *, const char *);
-#  endif
+#endif
 
-#  ifdef _WIN64
+#ifdef _WIN64
 /*
  * Even though sizeof(SOCKET) is 8, it's safe to cast it to int, because
  * the value constitutes an index in per-process table of limited size
@@ -57,121 +57,121 @@ struct servent *PASCAL getservbyname(const char *, const char *);
  * Windows run on happen to be two's-complement, which allows to
  * interchange INVALID_SOCKET and -1.
  */
-#   define socket(d,t,p)   ((int)socket(d,t,p))
-#   define accept(s,f,l)   ((int)accept(s,f,l))
-#  endif
+#define socket(d, t, p) ((int)socket(d, t, p))
+#define accept(s, f, l) ((int)accept(s, f, l))
+#endif
 
-# else
+#else
 
-#  ifndef NO_SYS_PARAM_H
-#   include <sys/param.h>
-#  endif
-#  ifdef OPENSSL_SYS_VXWORKS
-#   include <time.h>
-#  endif
+#ifndef NO_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef OPENSSL_SYS_VXWORKS
+#include <time.h>
+#endif
 
-#  include <netdb.h>
-#  if defined(OPENSSL_SYS_VMS_NODECC)
-#   include <socket.h>
-#   include <in.h>
-#   include <inet.h>
-#  else
-#   include <sys/socket.h>
-#   ifndef NO_SYS_UN_H
-#    include <sys/un.h>
-#    ifndef UNIX_PATH_MAX
-#     define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)NULL)->sun_path)
-#    endif
-#   endif
-#   ifdef FILIO_H
-#    include <sys/filio.h> /* FIONBIO in some SVR4, e.g. unixware, solaris */
-#   endif
-#   include <netinet/in.h>
-#   include <arpa/inet.h>
-#   include <netinet/tcp.h>
-#  endif
+#include <netdb.h>
+#if defined(OPENSSL_SYS_VMS_NODECC)
+#include <socket.h>
+#include <in.h>
+#include <inet.h>
+#else
+#include <sys/socket.h>
+#ifndef NO_SYS_UN_H
+#include <sys/un.h>
+#ifndef UNIX_PATH_MAX
+#define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)NULL)->sun_path)
+#endif
+#endif
+#ifdef FILIO_H
+#include <sys/filio.h> /* FIONBIO in some SVR4, e.g. unixware, solaris */
+#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netinet/tcp.h>
+#endif
 
-#  ifdef OPENSSL_SYS_AIX
-#   include <sys/select.h>
-#  endif
+#ifdef OPENSSL_SYS_AIX
+#include <sys/select.h>
+#endif
 
-#  ifndef VMS
-#   include <sys/ioctl.h>
-#  else
-#   if !defined(TCPIP_TYPE_SOCKETSHR) && defined(__VMS_VER) && (__VMS_VER > 70000000)
-     /* ioctl is only in VMS > 7.0 and when socketshr is not used */
-#    include <sys/ioctl.h>
-#   endif
-#   include <unixio.h>
-#   if defined(TCPIP_TYPE_SOCKETSHR)
-#    include <socketshr.h>
-#   endif
-#  endif
+#ifndef VMS
+#include <sys/ioctl.h>
+#else
+#if !defined(TCPIP_TYPE_SOCKETSHR) && defined(__VMS_VER) && (__VMS_VER > 70000000)
+/* ioctl is only in VMS > 7.0 and when socketshr is not used */
+#include <sys/ioctl.h>
+#endif
+#include <unixio.h>
+#if defined(TCPIP_TYPE_SOCKETSHR)
+#include <socketshr.h>
+#endif
+#endif
 
-#  ifndef INVALID_SOCKET
-#   define INVALID_SOCKET      (-1)
-#  endif
-# endif
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET (-1)
+#endif
+#endif
 
 /*
  * Some IPv6 implementations are broken, you can disable them in known
  * bad versions.
  */
-# if !defined(OPENSSL_USE_IPV6)
-#  if defined(AF_INET6)
-#   define OPENSSL_USE_IPV6 1
-#  else
-#   define OPENSSL_USE_IPV6 0
-#  endif
-# endif
+#if !defined(OPENSSL_USE_IPV6)
+#if defined(AF_INET6)
+#define OPENSSL_USE_IPV6 1
+#else
+#define OPENSSL_USE_IPV6 0
+#endif
+#endif
 
-# define get_last_socket_error() errno
-# define clear_socket_error()    errno=0
+#define get_last_socket_error() errno
+#define clear_socket_error() errno = 0
 
-# if defined(OPENSSL_SYS_WINDOWS)
-#  undef get_last_socket_error
-#  undef clear_socket_error
-#  define get_last_socket_error() WSAGetLastError()
-#  define clear_socket_error()    WSASetLastError(0)
-#  define readsocket(s,b,n)       recv((s),(b),(n),0)
-#  define writesocket(s,b,n)      send((s),(b),(n),0)
-# elif defined(__DJGPP__)
-#  define closesocket(s)          close_s(s)
-#  define readsocket(s,b,n)       read_s(s,b,n)
-#  define writesocket(s,b,n)      send(s,b,n,0)
-# elif defined(OPENSSL_SYS_VMS)
-#  define ioctlsocket(a,b,c)      ioctl(a,b,c)
-#  define closesocket(s)          close(s)
-#  define readsocket(s,b,n)       recv((s),(b),(n),0)
-#  define writesocket(s,b,n)      send((s),(b),(n),0)
-# elif defined(OPENSSL_SYS_VXWORKS)
-#  define ioctlsocket(a,b,c)          ioctl((a),(b),(int)(c))
-#  define closesocket(s)              close(s)
-#  define readsocket(s,b,n)           read((s),(b),(n))
-#  define writesocket(s,b,n)          write((s),(char *)(b),(n))
-# elif defined(OPENSSL_SYS_TANDEM)
-#  if defined(OPENSSL_TANDEM_FLOSS)
-#   include <floss.h(floss_read, floss_write)>
-#   define readsocket(s,b,n)       floss_read((s),(b),(n))
-#   define writesocket(s,b,n)      floss_write((s),(b),(n))
-#  else
-#   define readsocket(s,b,n)       read((s),(b),(n))
-#   define writesocket(s,b,n)      write((s),(b),(n))
-#  endif
-#  define ioctlsocket(a,b,c)      ioctl(a,b,c)
-#  define closesocket(s)          close(s)
-# else
-#  define ioctlsocket(a,b,c)      ioctl(a,b,c)
-#  define closesocket(s)          close(s)
-#  define readsocket(s,b,n)       read((s),(b),(n))
-#  define writesocket(s,b,n)      write((s),(b),(n))
-# endif
+#if defined(OPENSSL_SYS_WINDOWS)
+#undef get_last_socket_error
+#undef clear_socket_error
+#define get_last_socket_error() WSAGetLastError()
+#define clear_socket_error() WSASetLastError(0)
+#define readsocket(s, b, n) recv((s), (b), (n), 0)
+#define writesocket(s, b, n) send((s), (b), (n), 0)
+#elif defined(__DJGPP__)
+#define closesocket(s) close_s(s)
+#define readsocket(s, b, n) read_s(s, b, n)
+#define writesocket(s, b, n) send(s, b, n, 0)
+#elif defined(OPENSSL_SYS_VMS)
+#define ioctlsocket(a, b, c) ioctl(a, b, c)
+#define closesocket(s) close(s)
+#define readsocket(s, b, n) recv((s), (b), (n), 0)
+#define writesocket(s, b, n) send((s), (b), (n), 0)
+#elif defined(OPENSSL_SYS_VXWORKS)
+#define ioctlsocket(a, b, c) ioctl((a), (b), (int)(c))
+#define closesocket(s) close(s)
+#define readsocket(s, b, n) read((s), (b), (n))
+#define writesocket(s, b, n) write((s), (char *)(b), (n))
+#elif defined(OPENSSL_SYS_TANDEM)
+#if defined(OPENSSL_TANDEM_FLOSS)
+#include <floss.h(floss_read, floss_write)>
+#define readsocket(s, b, n) floss_read((s), (b), (n))
+#define writesocket(s, b, n) floss_write((s), (b), (n))
+#else
+#define readsocket(s, b, n) read((s), (b), (n))
+#define writesocket(s, b, n) write((s), (b), (n))
+#endif
+#define ioctlsocket(a, b, c) ioctl(a, b, c)
+#define closesocket(s) close(s)
+#else
+#define ioctlsocket(a, b, c) ioctl(a, b, c)
+#define closesocket(s) close(s)
+#define readsocket(s, b, n) read((s), (b), (n))
+#define writesocket(s, b, n) write((s), (b), (n))
+#endif
 
 /* also in apps/include/apps.h */
-# if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)
-#  define openssl_fdset(a, b) FD_SET((unsigned int)(a), b)
-# else
-#  define openssl_fdset(a, b) FD_SET(a, b)
-# endif
+#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)
+#define openssl_fdset(a, b) FD_SET((unsigned int)(a), b)
+#else
+#define openssl_fdset(a, b) FD_SET(a, b)
+#endif
 
 #endif
diff --git a/include/internal/sslconf.h b/include/internal/sslconf.h
index fd7f7e333183..a7cec01bf627 100644
--- a/include/internal/sslconf.h
+++ b/include/internal/sslconf.h
@@ -8,14 +8,14 @@
  */
 
 #ifndef OSSL_INTERNAL_SSLCONF_H
-# define OSSL_INTERNAL_SSLCONF_H
-# pragma once
+#define OSSL_INTERNAL_SSLCONF_H
+#pragma once
 
 typedef struct ssl_conf_cmd_st SSL_CONF_CMD;
 
 const SSL_CONF_CMD *conf_ssl_get(size_t idx, const char **name, size_t *cnt);
 int conf_ssl_name_find(const char *name, size_t *idx);
 void conf_ssl_get_cmd(const SSL_CONF_CMD *cmd, size_t idx, char **cmdstr,
-                      char **arg);
+    char **arg);
 
 #endif
diff --git a/include/internal/symhacks.h b/include/internal/symhacks.h
index 33bae51e49cc..01433c306152 100644
--- a/include/internal/symhacks.h
+++ b/include/internal/symhacks.h
@@ -8,20 +8,20 @@
  */
 
 #ifndef OSSL_INTERNAL_SYMHACKS_H
-# define OSSL_INTERNAL_SYMHACKS_H
-# pragma once
+#define OSSL_INTERNAL_SYMHACKS_H
+#pragma once
 
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
 
-# if defined(OPENSSL_SYS_VMS)
+#if defined(OPENSSL_SYS_VMS)
 
 /* ossl_provider_gettable_params vs OSSL_PROVIDER_gettable_params */
-#  undef ossl_provider_gettable_params
-#  define ossl_provider_gettable_params            ossl_int_prov_gettable_params
+#undef ossl_provider_gettable_params
+#define ossl_provider_gettable_params ossl_int_prov_gettable_params
 /* ossl_provider_get_params vs OSSL_PROVIDER_get_params */
-#  undef ossl_provider_get_params
-#  define ossl_provider_get_params                ossl_int_prov_get_params
+#undef ossl_provider_get_params
+#define ossl_provider_get_params ossl_int_prov_get_params
 
-# endif
+#endif
 
-#endif                          /* ! defined HEADER_VMS_IDHACKS_H */
+#endif /* ! defined HEADER_VMS_IDHACKS_H */
diff --git a/include/internal/thread_once.h b/include/internal/thread_once.h
index d6cb2eeec3bc..8c969441f3d7 100644
--- a/include/internal/thread_once.h
+++ b/include/internal/thread_once.h
@@ -8,10 +8,10 @@
  */
 
 #ifndef OSSL_INTERNAL_THREAD_ONCE_H
-# define OSSL_INTERNAL_THREAD_ONCE_H
-# pragma once
+#define OSSL_INTERNAL_THREAD_ONCE_H
+#pragma once
 
-# include <openssl/crypto.h>
+#include <openssl/crypto.h>
 
 /*
  * Initialisation of global data should never happen via "RUN_ONCE" inside the
@@ -19,7 +19,7 @@
  * OSSL_LIB_CTX object. In this way data will get cleaned up correctly when the
  * module gets unloaded.
  */
-# if !defined(FIPS_MODULE) || defined(ALLOW_RUN_ONCE_IN_FIPS)
+#if !defined(FIPS_MODULE) || defined(ALLOW_RUN_ONCE_IN_FIPS)
 /*
  * DEFINE_RUN_ONCE: Define an initialiser function that should be run exactly
  * once. It takes no arguments and returns an int result (1 for success or
@@ -34,21 +34,21 @@
  *     return 0;
  * }
  */
-#  define DEFINE_RUN_ONCE(init)                   \
-    static int init(void);                     \
-    int init##_ossl_ret_ = 0;                   \
-    void init##_ossl_(void)                     \
-    {                                           \
-        init##_ossl_ret_ = init();              \
-    }                                           \
+#define DEFINE_RUN_ONCE(init)      \
+    static int init(void);         \
+    int init##_ossl_ret_ = 0;      \
+    void init##_ossl_(void)        \
+    {                              \
+        init##_ossl_ret_ = init(); \
+    }                              \
     static int init(void)
 
 /*
  * DECLARE_RUN_ONCE: Declare an initialiser function that should be run exactly
  * once that has been defined in another file via DEFINE_RUN_ONCE().
  */
-#  define DECLARE_RUN_ONCE(init)                  \
-    extern int init##_ossl_ret_;                \
+#define DECLARE_RUN_ONCE(init)   \
+    extern int init##_ossl_ret_; \
     void init##_ossl_(void);
 
 /*
@@ -66,13 +66,13 @@
  *     return 0;
  * }
  */
-#  define DEFINE_RUN_ONCE_STATIC(init)            \
-    static int init(void);                     \
-    static int init##_ossl_ret_ = 0;            \
-    static void init##_ossl_(void)              \
-    {                                           \
-        init##_ossl_ret_ = init();              \
-    }                                           \
+#define DEFINE_RUN_ONCE_STATIC(init) \
+    static int init(void);           \
+    static int init##_ossl_ret_ = 0; \
+    static void init##_ossl_(void)   \
+    {                                \
+        init##_ossl_ret_ = init();   \
+    }                                \
     static int init(void)
 
 /*
@@ -107,7 +107,7 @@
  *     return 0;
  * }
  */
-#  define DEFINE_RUN_ONCE_STATIC_ALT(initalt, init) \
+#define DEFINE_RUN_ONCE_STATIC_ALT(initalt, init) \
     static int initalt(void);                     \
     static void initalt##_ossl_(void)             \
     {                                             \
@@ -126,7 +126,7 @@
  *
  * (*) by convention, since the init function must return 1 on success.
  */
-#  define RUN_ONCE(once, init)                                            \
+#define RUN_ONCE(once, init) \
     (CRYPTO_THREAD_run_once(once, init##_ossl_) ? init##_ossl_ret_ : 0)
 
 /*
@@ -144,8 +144,8 @@
  *
  * (*) by convention, since the init function must return 1 on success.
  */
-#  define RUN_ONCE_ALT(once, initalt, init)                               \
+#define RUN_ONCE_ALT(once, initalt, init) \
     (CRYPTO_THREAD_run_once(once, initalt##_ossl_) ? init##_ossl_ret_ : 0)
 
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 #endif /* OSSL_INTERNAL_THREAD_ONCE_H */
diff --git a/include/internal/tlsgroups.h b/include/internal/tlsgroups.h
index 8a35ced12270..142bd552a1dd 100644
--- a/include/internal/tlsgroups.h
+++ b/include/internal/tlsgroups.h
@@ -8,43 +8,43 @@
  */
 
 #ifndef OSSL_INTERNAL_TLSGROUPS_H
-# define OSSL_INTERNAL_TLSGROUPS_H
-# pragma once
+#define OSSL_INTERNAL_TLSGROUPS_H
+#pragma once
 
-# define OSSL_TLS_GROUP_ID_sect163k1        0x0001
-# define OSSL_TLS_GROUP_ID_sect163r1        0x0002
-# define OSSL_TLS_GROUP_ID_sect163r2        0x0003
-# define OSSL_TLS_GROUP_ID_sect193r1        0x0004
-# define OSSL_TLS_GROUP_ID_sect193r2        0x0005
-# define OSSL_TLS_GROUP_ID_sect233k1        0x0006
-# define OSSL_TLS_GROUP_ID_sect233r1        0x0007
-# define OSSL_TLS_GROUP_ID_sect239k1        0x0008
-# define OSSL_TLS_GROUP_ID_sect283k1        0x0009
-# define OSSL_TLS_GROUP_ID_sect283r1        0x000A
-# define OSSL_TLS_GROUP_ID_sect409k1        0x000B
-# define OSSL_TLS_GROUP_ID_sect409r1        0x000C
-# define OSSL_TLS_GROUP_ID_sect571k1        0x000D
-# define OSSL_TLS_GROUP_ID_sect571r1        0x000E
-# define OSSL_TLS_GROUP_ID_secp160k1        0x000F
-# define OSSL_TLS_GROUP_ID_secp160r1        0x0010
-# define OSSL_TLS_GROUP_ID_secp160r2        0x0011
-# define OSSL_TLS_GROUP_ID_secp192k1        0x0012
-# define OSSL_TLS_GROUP_ID_secp192r1        0x0013
-# define OSSL_TLS_GROUP_ID_secp224k1        0x0014
-# define OSSL_TLS_GROUP_ID_secp224r1        0x0015
-# define OSSL_TLS_GROUP_ID_secp256k1        0x0016
-# define OSSL_TLS_GROUP_ID_secp256r1        0x0017
-# define OSSL_TLS_GROUP_ID_secp384r1        0x0018
-# define OSSL_TLS_GROUP_ID_secp521r1        0x0019
-# define OSSL_TLS_GROUP_ID_brainpoolP256r1  0x001A
-# define OSSL_TLS_GROUP_ID_brainpoolP384r1  0x001B
-# define OSSL_TLS_GROUP_ID_brainpoolP512r1  0x001C
-# define OSSL_TLS_GROUP_ID_x25519           0x001D
-# define OSSL_TLS_GROUP_ID_x448             0x001E
-# define OSSL_TLS_GROUP_ID_ffdhe2048        0x0100
-# define OSSL_TLS_GROUP_ID_ffdhe3072        0x0101
-# define OSSL_TLS_GROUP_ID_ffdhe4096        0x0102
-# define OSSL_TLS_GROUP_ID_ffdhe6144        0x0103
-# define OSSL_TLS_GROUP_ID_ffdhe8192        0x0104
+#define OSSL_TLS_GROUP_ID_sect163k1 0x0001
+#define OSSL_TLS_GROUP_ID_sect163r1 0x0002
+#define OSSL_TLS_GROUP_ID_sect163r2 0x0003
+#define OSSL_TLS_GROUP_ID_sect193r1 0x0004
+#define OSSL_TLS_GROUP_ID_sect193r2 0x0005
+#define OSSL_TLS_GROUP_ID_sect233k1 0x0006
+#define OSSL_TLS_GROUP_ID_sect233r1 0x0007
+#define OSSL_TLS_GROUP_ID_sect239k1 0x0008
+#define OSSL_TLS_GROUP_ID_sect283k1 0x0009
+#define OSSL_TLS_GROUP_ID_sect283r1 0x000A
+#define OSSL_TLS_GROUP_ID_sect409k1 0x000B
+#define OSSL_TLS_GROUP_ID_sect409r1 0x000C
+#define OSSL_TLS_GROUP_ID_sect571k1 0x000D
+#define OSSL_TLS_GROUP_ID_sect571r1 0x000E
+#define OSSL_TLS_GROUP_ID_secp160k1 0x000F
+#define OSSL_TLS_GROUP_ID_secp160r1 0x0010
+#define OSSL_TLS_GROUP_ID_secp160r2 0x0011
+#define OSSL_TLS_GROUP_ID_secp192k1 0x0012
+#define OSSL_TLS_GROUP_ID_secp192r1 0x0013
+#define OSSL_TLS_GROUP_ID_secp224k1 0x0014
+#define OSSL_TLS_GROUP_ID_secp224r1 0x0015
+#define OSSL_TLS_GROUP_ID_secp256k1 0x0016
+#define OSSL_TLS_GROUP_ID_secp256r1 0x0017
+#define OSSL_TLS_GROUP_ID_secp384r1 0x0018
+#define OSSL_TLS_GROUP_ID_secp521r1 0x0019
+#define OSSL_TLS_GROUP_ID_brainpoolP256r1 0x001A
+#define OSSL_TLS_GROUP_ID_brainpoolP384r1 0x001B
+#define OSSL_TLS_GROUP_ID_brainpoolP512r1 0x001C
+#define OSSL_TLS_GROUP_ID_x25519 0x001D
+#define OSSL_TLS_GROUP_ID_x448 0x001E
+#define OSSL_TLS_GROUP_ID_ffdhe2048 0x0100
+#define OSSL_TLS_GROUP_ID_ffdhe3072 0x0101
+#define OSSL_TLS_GROUP_ID_ffdhe4096 0x0102
+#define OSSL_TLS_GROUP_ID_ffdhe6144 0x0103
+#define OSSL_TLS_GROUP_ID_ffdhe8192 0x0104
 
 #endif
diff --git a/include/internal/tsan_assist.h b/include/internal/tsan_assist.h
index 60ecbd5f04f3..5556d1467c5c 100644
--- a/include/internal/tsan_assist.h
+++ b/include/internal/tsan_assist.h
@@ -49,35 +49,34 @@
 
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
     && !defined(__STDC_NO_ATOMICS__)
-# include <stdatomic.h>
+#include <stdatomic.h>
 
-# if defined(ATOMIC_POINTER_LOCK_FREE) \
-          && ATOMIC_POINTER_LOCK_FREE >= 2
-#  define TSAN_QUALIFIER _Atomic
-#  define tsan_load(ptr) atomic_load_explicit((ptr), memory_order_relaxed)
-#  define tsan_store(ptr, val) atomic_store_explicit((ptr), (val), memory_order_relaxed)
-#  define tsan_counter(ptr) atomic_fetch_add_explicit((ptr), 1, memory_order_relaxed)
-#  define tsan_decr(ptr) atomic_fetch_add_explicit((ptr), -1, memory_order_relaxed)
-#  define tsan_ld_acq(ptr) atomic_load_explicit((ptr), memory_order_acquire)
-#  define tsan_st_rel(ptr, val) atomic_store_explicit((ptr), (val), memory_order_release)
-# endif
+#if defined(ATOMIC_POINTER_LOCK_FREE) \
+    && ATOMIC_POINTER_LOCK_FREE >= 2
+#define TSAN_QUALIFIER _Atomic
+#define tsan_load(ptr) atomic_load_explicit((ptr), memory_order_relaxed)
+#define tsan_store(ptr, val) atomic_store_explicit((ptr), (val), memory_order_relaxed)
+#define tsan_counter(ptr) atomic_fetch_add_explicit((ptr), 1, memory_order_relaxed)
+#define tsan_decr(ptr) atomic_fetch_add_explicit((ptr), -1, memory_order_relaxed)
+#define tsan_ld_acq(ptr) atomic_load_explicit((ptr), memory_order_acquire)
+#define tsan_st_rel(ptr, val) atomic_store_explicit((ptr), (val), memory_order_release)
+#endif
 
 #elif defined(__GNUC__) && defined(__ATOMIC_RELAXED)
 
-# if defined(__GCC_ATOMIC_POINTER_LOCK_FREE) \
-          && __GCC_ATOMIC_POINTER_LOCK_FREE >= 2
-#  define TSAN_QUALIFIER volatile
-#  define tsan_load(ptr) __atomic_load_n((ptr), __ATOMIC_RELAXED)
-#  define tsan_store(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_RELAXED)
-#  define tsan_counter(ptr) __atomic_fetch_add((ptr), 1, __ATOMIC_RELAXED)
-#  define tsan_decr(ptr) __atomic_fetch_add((ptr), -1, __ATOMIC_RELAXED)
-#  define tsan_ld_acq(ptr) __atomic_load_n((ptr), __ATOMIC_ACQUIRE)
-#  define tsan_st_rel(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_RELEASE)
-# endif
+#if defined(__GCC_ATOMIC_POINTER_LOCK_FREE) \
+    && __GCC_ATOMIC_POINTER_LOCK_FREE >= 2
+#define TSAN_QUALIFIER volatile
+#define tsan_load(ptr) __atomic_load_n((ptr), __ATOMIC_RELAXED)
+#define tsan_store(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_RELAXED)
+#define tsan_counter(ptr) __atomic_fetch_add((ptr), 1, __ATOMIC_RELAXED)
+#define tsan_decr(ptr) __atomic_fetch_add((ptr), -1, __ATOMIC_RELAXED)
+#define tsan_ld_acq(ptr) __atomic_load_n((ptr), __ATOMIC_ACQUIRE)
+#define tsan_st_rel(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_RELEASE)
+#endif
 
-#elif defined(_MSC_VER) && _MSC_VER>=1200 \
-      && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || \
-          defined(_M_ARM64) || (defined(_M_ARM) && _M_ARM >= 7 && !defined(_WIN32_WCE)))
+#elif defined(_MSC_VER) && _MSC_VER >= 1200 \
+    && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || defined(_M_ARM64) || (defined(_M_ARM) && _M_ARM >= 7 && !defined(_WIN32_WCE)))
 /*
  * There is subtle dependency on /volatile:<iso|ms> command-line option.
  * "ms" implies same semantic as memory_order_acquire for loads and
@@ -89,58 +88,58 @@
  * with additional instructions and penalties, it kind of makes sense to
  * default to "iso"...
  */
-# define TSAN_QUALIFIER volatile
-# if defined(_M_ARM) || defined(_M_ARM64)
-#  define _InterlockedExchangeAdd _InterlockedExchangeAdd_nf
-#  pragma intrinsic(_InterlockedExchangeAdd_nf)
-#  pragma intrinsic(__iso_volatile_load32, __iso_volatile_store32)
-#  ifdef _WIN64
-#   define _InterlockedExchangeAdd64 _InterlockedExchangeAdd64_nf
-#   pragma intrinsic(_InterlockedExchangeAdd64_nf)
-#   pragma intrinsic(__iso_volatile_load64, __iso_volatile_store64)
-#   define tsan_load(ptr) (sizeof(*(ptr)) == 8 ? __iso_volatile_load64(ptr) \
-                                               : __iso_volatile_load32(ptr))
-#   define tsan_store(ptr, val) (sizeof(*(ptr)) == 8 ? __iso_volatile_store64((ptr), (val)) \
-                                                     : __iso_volatile_store32((ptr), (val)))
-#  else
-#   define tsan_load(ptr) __iso_volatile_load32(ptr)
-#   define tsan_store(ptr, val) __iso_volatile_store32((ptr), (val))
-#  endif
-# else
-#  define tsan_load(ptr) (*(ptr))
-#  define tsan_store(ptr, val) (*(ptr) = (val))
-# endif
-# pragma intrinsic(_InterlockedExchangeAdd)
-# ifdef _WIN64
-#  pragma intrinsic(_InterlockedExchangeAdd64)
-#  define tsan_counter(ptr) (sizeof(*(ptr)) == 8 ? _InterlockedExchangeAdd64((ptr), 1) \
-                                                 : _InterlockedExchangeAdd((ptr), 1))
-#  define tsan_decr(ptr) (sizeof(*(ptr)) == 8 ? _InterlockedExchangeAdd64((ptr), -1) \
-                                                 : _InterlockedExchangeAdd((ptr), -1))
-# else
-#  define tsan_counter(ptr) _InterlockedExchangeAdd((ptr), 1)
-#  define tsan_decr(ptr) _InterlockedExchangeAdd((ptr), -1)
-# endif
-# if !defined(_ISO_VOLATILE)
-#  define tsan_ld_acq(ptr) (*(ptr))
-#  define tsan_st_rel(ptr, val) (*(ptr) = (val))
-# endif
+#define TSAN_QUALIFIER volatile
+#if defined(_M_ARM) || defined(_M_ARM64)
+#define _InterlockedExchangeAdd _InterlockedExchangeAdd_nf
+#pragma intrinsic(_InterlockedExchangeAdd_nf)
+#pragma intrinsic(__iso_volatile_load32, __iso_volatile_store32)
+#ifdef _WIN64
+#define _InterlockedExchangeAdd64 _InterlockedExchangeAdd64_nf
+#pragma intrinsic(_InterlockedExchangeAdd64_nf)
+#pragma intrinsic(__iso_volatile_load64, __iso_volatile_store64)
+#define tsan_load(ptr) (sizeof(*(ptr)) == 8 ? __iso_volatile_load64(ptr) \
+                                            : __iso_volatile_load32(ptr))
+#define tsan_store(ptr, val) (sizeof(*(ptr)) == 8 ? __iso_volatile_store64((ptr), (val)) \
+                                                  : __iso_volatile_store32((ptr), (val)))
+#else
+#define tsan_load(ptr) __iso_volatile_load32(ptr)
+#define tsan_store(ptr, val) __iso_volatile_store32((ptr), (val))
+#endif
+#else
+#define tsan_load(ptr) (*(ptr))
+#define tsan_store(ptr, val) (*(ptr) = (val))
+#endif
+#pragma intrinsic(_InterlockedExchangeAdd)
+#ifdef _WIN64
+#pragma intrinsic(_InterlockedExchangeAdd64)
+#define tsan_counter(ptr) (sizeof(*(ptr)) == 8 ? _InterlockedExchangeAdd64((ptr), 1) \
+                                               : _InterlockedExchangeAdd((ptr), 1))
+#define tsan_decr(ptr) (sizeof(*(ptr)) == 8 ? _InterlockedExchangeAdd64((ptr), -1) \
+                                            : _InterlockedExchangeAdd((ptr), -1))
+#else
+#define tsan_counter(ptr) _InterlockedExchangeAdd((ptr), 1)
+#define tsan_decr(ptr) _InterlockedExchangeAdd((ptr), -1)
+#endif
+#if !defined(_ISO_VOLATILE)
+#define tsan_ld_acq(ptr) (*(ptr))
+#define tsan_st_rel(ptr, val) (*(ptr) = (val))
+#endif
 
 #endif
 
 #ifndef TSAN_QUALIFIER
 
-# ifdef OPENSSL_THREADS
-#  define TSAN_QUALIFIER volatile
-#  define TSAN_REQUIRES_LOCKING
-# else  /* OPENSSL_THREADS */
-#  define TSAN_QUALIFIER
-# endif /* OPENSSL_THREADS */
+#ifdef OPENSSL_THREADS
+#define TSAN_QUALIFIER volatile
+#define TSAN_REQUIRES_LOCKING
+#else /* OPENSSL_THREADS */
+#define TSAN_QUALIFIER
+#endif /* OPENSSL_THREADS */
 
-# define tsan_load(ptr) (*(ptr))
-# define tsan_store(ptr, val) (*(ptr) = (val))
-# define tsan_counter(ptr) ((*(ptr))++)
-# define tsan_decr(ptr) ((*(ptr))--)
+#define tsan_load(ptr) (*(ptr))
+#define tsan_store(ptr, val) (*(ptr) = (val))
+#define tsan_counter(ptr) ((*(ptr))++)
+#define tsan_decr(ptr) ((*(ptr))--)
 /*
  * Lack of tsan_ld_acq and tsan_ld_rel means that compiler support is not
  * sophisticated enough to support them. Code that relies on them should be
diff --git a/include/internal/unicode.h b/include/internal/unicode.h
index a6de8352d680..4ef53cd69c2f 100644
--- a/include/internal/unicode.h
+++ b/include/internal/unicode.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_INTERNAL_UNICODE_H
-# define OSSL_INTERNAL_UNICODE_H
-# pragma once
+#define OSSL_INTERNAL_UNICODE_H
+#pragma once
 
 typedef enum {
     SURROGATE_MIN = 0xd800UL,